From cvs-return-28737-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org Fri Oct 27 19:05:43 2006 Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 79812 invoked from network); 27 Oct 2006 19:05:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Oct 2006 19:05:41 -0000 Received: (qmail 92791 invoked by uid 500); 27 Oct 2006 19:05:52 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 92737 invoked by uid 500); 27 Oct 2006 19:05:52 -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 92725 invoked by uid 99); 27 Oct 2006 19:05:52 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Oct 2006 12:05:52 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Oct 2006 12:05:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0D3A51A9846; Fri, 27 Oct 2006 12:05:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r468501 - /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Date: Fri, 27 Oct 2006 19:05:18 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061027190519.0D3A51A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Oct 27 12:05:18 2006 New Revision: 468501 URL: http://svn.apache.org/viewvc?view=rev&rev=468501 Log: Fix compilation of jcr test cases Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java?view=diff&rev=468501&r1=468500&r2=468501 ============================================================================== --- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java (original) +++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Fri Oct 27 12:05:18 2006 @@ -32,6 +32,7 @@ import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; import org.apache.avalon.framework.container.ContainerUtil; import org.apache.avalon.framework.context.Context; +import org.apache.avalon.framework.context.ContextException; import org.apache.avalon.framework.context.DefaultContext; import org.apache.avalon.framework.logger.ConsoleLogger; import org.apache.avalon.framework.logger.Logger; @@ -287,13 +288,24 @@ } } defaultContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, new MockContext()); - this.addContext( defaultContext ); + final MapBasedDefaultContext avalonConfig = new MapBasedDefaultContext(defaultContext); + this.addContext( avalonConfig ); + this.addContext(defaultContext); return defaultContext ; } /** * This method may be overwritten by subclasses to put additional objects * into the context programmatically. + * @deprecated Use {@link #addContext(Map)} instead. + */ + protected void addContext( DefaultContext defaultContext ) { + // nothing to add here + } + + /** + * This method may be overwritten by subclasses to put additional objects + * into the context programmatically. */ protected void addContext( Map defaultContext ) { // nothing to add here @@ -457,5 +469,39 @@ public boolean isSingleton() { return true; } + } + + protected final static class MapBasedDefaultContext extends DefaultContext { + + private final Map map; + + public MapBasedDefaultContext(Map aMap) { + this.map = aMap; + } + + /** + * @see org.apache.avalon.framework.context.DefaultContext#put(java.lang.Object, java.lang.Object) + */ + public void put(Object arg0, Object arg1) throws IllegalStateException { + super.put(arg0, arg1); + this.map.put(arg0, arg1); + } + + /** + * @see org.apache.avalon.framework.context.DefaultContext#get(java.lang.Object) + */ + public Object get(Object arg0) throws ContextException { + Object result; + try { + result = super.get(arg0); + } catch (ContextException e) { + result = this.map.get(arg0); + if ( result == null ) { + throw e; + } + } + return result; + } + } }