From 5076c0e6b8b2ad267d2118e9f5f685d7aae282dd Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Tue, 24 Feb 2009 13:12:03 +0000 Subject: QPID-1612: add test class for ServerConfiguration git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747367 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/configuration/ServerConfigurationTest.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'qpid/java') diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java index c734655b0c..90fe55a1cf 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.server.configuration; +<<<<<<< HEAD:qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -27,6 +28,12 @@ import java.util.List; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.SystemConfiguration; +======= +import java.util.List; + +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.PropertiesConfiguration; +>>>>>>> QPID-1612: add test class for ServerConfiguration:qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java import org.apache.commons.configuration.XMLConfiguration; import junit.framework.TestCase; -- cgit v1.2.1