diff options
| author | Aidan Skinner <aidan@apache.org> | 2009-02-24 13:12:03 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2009-02-24 13:12:03 +0000 |
| commit | 065e71a1e3379c5976369a7dd3f03a05094fd785 (patch) | |
| tree | a52a92600c6ae4edb384715e8f090f4b3cad1a26 /java/broker/src/test | |
| parent | 2522d584591aeb421261c00c4a36df1a2f19252b (diff) | |
| download | qpid-python-065e71a1e3379c5976369a7dd3f03a05094fd785.tar.gz | |
QPID-1612: add test class for ServerConfiguration
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@747367 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/test')
| -rw-r--r-- | java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java index c734655b0c..90fe55a1cf 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java +++ b/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; |