Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 60366 invoked from network); 30 Apr 2006 19:05:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Apr 2006 19:05:22 -0000 Received: (qmail 82799 invoked by uid 500); 30 Apr 2006 19:05:22 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 82741 invoked by uid 500); 30 Apr 2006 19:05:21 -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 82644 invoked by uid 99); 30 Apr 2006 19:05:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 30 Apr 2006 12:05:20 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 30 Apr 2006 12:05:20 -0700 Received: (qmail 60102 invoked by uid 65534); 30 Apr 2006 19:05:00 -0000 Message-ID: <20060430190500.60098.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r398404 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java Date: Sun, 30 Apr 2006 19:04:59 -0000 To: cvs@cocoon.apache.org From: danielf@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: danielf Date: Sun Apr 30 12:04:58 2006 New Revision: 398404 URL: http://svn.apache.org/viewcvs?rev=398404&view=rev Log: The servlet context isn't used in the methods that is called with the Avalon environment as arguments here. The removed code also broke previous contracts as it made the presence of a ServletConfig mandatory in the Avalon context, it has always been optional and environmetn dependent before. Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java?rev=398404&r1=398403&r2=398404&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java (original) +++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java Sun Apr 30 12:04:58 2006 @@ -70,8 +70,12 @@ } else { ae.logger = (Logger)parentFactory.getBean(ProcessingUtil.LOGGER_ROLE); } - ae.servletContext = ((ServletConfig) sitemapContext.get(CocoonServlet.CONTEXT_SERVLET_CONFIG)) - .getServletContext(); + // The servletContext isn't used here, furthermore it breaks previous contracts + // to have a mandatory dependency on the existence of a servlet config within the + // sitemap context, this dependency has always been optional. /DF + // ae.servletContext = ((ServletConfig) sitemapContext.get(CocoonServlet.CONTEXT_SERVLET_CONFIG)) + // .getServletContext(); + ae.servletContext = null; ae.settings = settings; final ConfigurationInfo parentConfigInfo = (ConfigurationInfo) parentFactory .getBean(ConfigurationInfo.class.getName());