Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 24432 invoked from network); 16 Sep 2007 12:04:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Sep 2007 12:04:40 -0000 Received: (qmail 86004 invoked by uid 500); 16 Sep 2007 12:04:32 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 85929 invoked by uid 500); 16 Sep 2007 12:04:32 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 85918 invoked by uid 99); 16 Sep 2007 12:04:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Sep 2007 05:04:32 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Sep 2007 12:04:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D1C251A983A; Sun, 16 Sep 2007 05:04:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r576083 - /cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java Date: Sun, 16 Sep 2007 12:04:18 -0000 To: cvs@cocoon.apache.org From: danielf@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070916120418.D1C251A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: danielf Date: Sun Sep 16 05:04:17 2007 New Revision: 576083 URL: http://svn.apache.org/viewvc?rev=576083&view=rev Log: Make trunk compilable with Spring 2.1. Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java Modified: cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java?rev=576083&r1=576082&r2=576083&view=diff ============================================================================== --- cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java (original) +++ cocoon/trunk/tools/cocoon-rcl/cocoon-rcl-spring-reloader/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java Sun Sep 16 05:04:17 2007 @@ -105,6 +105,13 @@ return appContext.getBean(arg0); } + // Make the class compilable with Spring 2.1 + // FIXME: delegate to appContext, when updating to Spring 2.1 + public Object getBean(String arg0, Object[] arg1) throws BeansException { + throw new UnsupportedOperationException(); + //return appContext.getBean(arg0, arg1); + } + public synchronized int getBeanDefinitionCount() { return appContext.getBeanDefinitionCount(); }