summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan Skinner <aidan@apache.org>2009-02-24 13:29:59 +0000
committerAidan Skinner <aidan@apache.org>2009-02-24 13:29:59 +0000
commit37d3f0675c0b7f6052c14d104a6b03e78b86965a (patch)
treef6959c3f96a19a5a6092191cab7dc56373a4618c
parent460bc9cc75150f54c7802b15b56164cab4ad04d4 (diff)
downloadqpid-python-37d3f0675c0b7f6052c14d104a6b03e78b86965a.tar.gz
Fix build deps file
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747376 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java4
-rw-r--r--qpid/java/build.deps5
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} \