diff options
-rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java | 4 | ||||
-rw-r--r-- | qpid/java/build.deps | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index af1df13609..b3c08a2a95 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -27,16 +27,12 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.configuration.CombinedConfiguration; import org.apache.commons.configuration.CompositeConfiguration; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.ConfigurationFactory; -import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.SystemConfiguration; import org.apache.commons.configuration.XMLConfiguration; -import org.apache.commons.configuration.ConfigurationFactory.DigesterConfigurationFactory; -import org.apache.commons.configuration.tree.ExpressionEngine; public class ServerConfiguration { diff --git a/qpid/java/build.deps b/qpid/java/build.deps index 2a6eee6478..24710893bc 100644 --- a/qpid/java/build.deps +++ b/qpid/java/build.deps @@ -73,9 +73,8 @@ geronimo-servlet=lib/geronimo-servlet_2.5_spec-1.2.jar felix.libs=${osgi-core} ${felix-framework} common.libs=${slf4j-api} ${backport-util-concurrent} ${mina-core} \ - ${mina-filter-ssl} ${commons-beanutils-core} ${commons-codec} \ - ${commons-lang} ${commons-collections} ${commons-configuration} \ - ${commons-digester} + ${mina-filter-ssl} ${commons-beanutils-core} ${commons-digester} ${commons-codec} ${commons-lang} ${commons-collections} \ + ${commons-configuration} client.libs=${common.libs} ${geronimo-jms} tools.libs=${client.libs} broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \ |