cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
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 GMT
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());



Mime
View raw message