You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/04/13 15:14:50 UTC
svn commit: r764438 - in /qpid/branches/0.5-fix/qpid: ./
java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
java/build.deps
Author: ritchiem
Date: Mon Apr 13 13:14:50 2009
New Revision: 764438
URL: http://svn.apache.org/viewvc?rev=764438&view=rev
Log:
Fix build deps file
merged from trunk r747376
Modified:
qpid/branches/0.5-fix/qpid/ (props changed)
qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/0.5-fix/qpid/java/build.deps
Propchange: qpid/branches/0.5-fix/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 13 13:14:50 2009
@@ -1 +1 @@
-/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370
+/qpid/trunk/qpid:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376
Modified: qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=764438&r1=764437&r2=764438&view=diff
==============================================================================
--- qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java (original)
+++ qpid/branches/0.5-fix/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java Mon Apr 13 13:14:50 2009
@@ -27,16 +27,12 @@
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
{
Modified: qpid/branches/0.5-fix/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/branches/0.5-fix/qpid/java/build.deps?rev=764438&r1=764437&r2=764438&view=diff
==============================================================================
--- qpid/branches/0.5-fix/qpid/java/build.deps (original)
+++ qpid/branches/0.5-fix/qpid/java/build.deps Mon Apr 13 13:14:50 2009
@@ -67,9 +67,8 @@
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} \
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org