Return-Path: Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: (qmail 8979 invoked from network); 24 Feb 2009 13:30:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Feb 2009 13:30:23 -0000 Received: (qmail 38394 invoked by uid 500); 24 Feb 2009 13:30:22 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 38384 invoked by uid 500); 24 Feb 2009 13:30:22 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 38375 invoked by uid 99); 24 Feb 2009 13:30:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2009 05:30:22 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2009 13:30:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0A0B3238889E; Tue, 24 Feb 2009 13:30:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r747376 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java build.deps Date: Tue, 24 Feb 2009 13:29:59 -0000 To: commits@qpid.apache.org From: aidan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090224133000.0A0B3238889E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aidan Date: Tue Feb 24 13:29:59 2009 New Revision: 747376 URL: http://svn.apache.org/viewvc?rev=747376&view=rev Log: Fix build deps file Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java qpid/trunk/qpid/java/build.deps Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=747376&r1=747375&r2=747376&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java (original) +++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java Tue Feb 24 13:29:59 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/trunk/qpid/java/build.deps URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=747376&r1=747375&r2=747376&view=diff ============================================================================== --- qpid/trunk/qpid/java/build.deps (original) +++ qpid/trunk/qpid/java/build.deps Tue Feb 24 13:29:59 2009 @@ -73,9 +73,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