From b1d9af6773691e326092a138b4dadf5aaaa2afb4 Mon Sep 17 00:00:00 2001 From: Aidan Skinner Date: Tue, 24 Feb 2009 13:12:59 +0000 Subject: QPID-1612: add environment variables for some things, sanitise the housekeeping timer. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747369 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/configuration/ServerConfigurationTest.java | 10 ---------- 1 file changed, 10 deletions(-) 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 90fe55a1cf..3e9a151973 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,20 +20,10 @@ */ 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; -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