Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 69928 invoked from network); 1 Feb 2005 17:01:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 1 Feb 2005 17:01:53 -0000 Received: (qmail 40075 invoked by uid 500); 1 Feb 2005 17:01:51 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 39995 invoked by uid 500); 1 Feb 2005 17:01:51 -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: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 39982 invoked by uid 99); 1 Feb 2005 17:01:51 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 01 Feb 2005 09:01:50 -0800 Received: (qmail 69854 invoked by uid 65534); 1 Feb 2005 17:01:48 -0000 Message-ID: <20050201170148.69849.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 01 Feb 2005 17:01:48 -0000 Subject: svn commit: r149417 - in cocoon/trunk/src: blocks/portal/java/org/apache/cocoon/portlet/ core/java/org/apache/cocoon/configuration/ core/java/org/apache/cocoon/core/ core/java/org/apache/cocoon/core/container/ core/java/org/apache/cocoon/core/container/util/ core/test/org/apache/cocoon/core/container/util/ java/org/apache/cocoon/ java/org/apache/cocoon/bean/ java/org/apache/cocoon/components/ java/org/apache/cocoon/components/container/ java/org/apache/cocoon/servlet/ To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: cziegeler Date: Tue Feb 1 09:01:45 2005 New Revision: 149417 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D149417 Log: Finish properties handling Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPor= tlet.java cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Configuratio= nBuilder.java cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.java cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEn= vironment.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreService= Manager.java cocoon/trunk/src/core/java/org/apache/cocoon/core/container/util/Proper= tyHelper.java cocoon/trunk/src/core/test/org/apache/cocoon/core/container/util/Proper= tyHelperTestCase.java cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java cocoon/trunk/src/java/org/apache/cocoon/components/ContextHelper.java cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHel= per.java cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/Coc= oonPortlet.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/portal/java/org/= apache/cocoon/portlet/CocoonPortlet.java?view=3Ddiff&r1=3D149416&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPor= tlet.java (original) +++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portlet/CocoonPor= tlet.java Tue Feb 1 09:01:45 2005 @@ -35,6 +35,8 @@ import org.apache.cocoon.components.notification.DefaultNotifyingBuilder; import org.apache.cocoon.components.notification.Notifier; import org.apache.cocoon.components.notification.Notifying; +import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Core; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.portlet.PortletContext; import org.apache.cocoon.environment.portlet.PortletEnvironment; @@ -287,6 +289,8 @@ =20 this.portletContext =3D conf.getPortletContext(); this.appContext.put(Constants.CONTEXT_ENVIRONMENT_CONTEXT, new Por= tletContext(this.portletContext)); + // FIXME - add settings + appContext.put(Core.CONTEXT_SETTINGS, new Settings()); this.portletContextPath =3D this.portletContext.getRealPath("/"); =20 // first init the work-directory for the logger. Modified: cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Config= urationBuilder.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/co= coon/configuration/ConfigurationBuilder.java?view=3Ddiff&r1=3D149416&r2=3D1= 49417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Configuratio= nBuilder.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Configuratio= nBuilder.java Tue Feb 1 09:01:45 2005 @@ -94,11 +94,13 @@ private Configuration configuration; private Locator locator; private final NamespaceSupport namespaceSupport =3D new NamespaceSuppo= rt(); - + private final Settings settings; + =20 /** * Create a Configuration Builder */ - public ConfigurationBuilder() { + public ConfigurationBuilder(Settings s) { + this.settings =3D s; try { final SAXParserFactory saxParserFactory =3D SAXParserFactory.n= ewInstance(); =20 @@ -272,7 +274,7 @@ } else { finishedValue =3D accumulatedValue.trim(); } - finishedConfiguration.setValue( PropertyHelper.replace(finishe= dValue) ); + finishedConfiguration.setValue( PropertyHelper.replace(finishe= dValue, this.settings) ); } else { final String trimmedValue =3D accumulatedValue.trim(); if( trimmedValue.length() > 0 ) { @@ -367,7 +369,7 @@ for( int i =3D 0; i < attributesSize; i++ ) { final String name =3D componentAttr.getQName( i ); final String value =3D componentAttr.getValue( i ); - configuration.setAttribute( name, PropertyHelper.replace(value= ) ); + configuration.setAttribute( name, PropertyHelper.replace(value= , this.settings) ); } } =20 Modified: cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settin= gs.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/co= coon/configuration/Settings.java?view=3Ddiff&r1=3D149416&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.jav= a (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/configuration/Settings.jav= a Tue Feb 1 09:01:45 2005 @@ -57,6 +57,11 @@ public static final boolean MANAGE_EXCEPTIONS =3D true; =20 /** + * The list of properties used to configure Cocoon + */ + protected List properties =3D new ArrayList(); + + /** * This parameter tells Cocoon to set the thread's context classloader= to * its own classloader. If you experience strange classloader issues, * try setting this parameter to "true". @@ -252,7 +257,7 @@ key =3D key.substring("org.apache.cocoon.".length()); final String value =3D current.getValue().toString(); =20 - if ( key.equals("init.classloader") ) {=20 + if ( key.equals("init.classloader") ) { this.initClassloader =3D BooleanUtils.toBoolean(va= lue); } else if ( key.equals("configuration") ) { this.configuration =3D value; @@ -300,6 +305,7 @@ // TODO - force property, load classes, extra class pa= th } } + this.properties.add(props); } } =20 @@ -673,5 +679,75 @@ "- Log4J Configuration: " + this.log4jConfiguration + "\n" + "- Override Loglevel: " + this.overrideLogLevel + "\n"; =20 + } + + public String getProperty(String name) { + return this.getProperty(name, null); + } + + public String getProperty(String key, String defaultValue) { + if ( key =3D=3D null ) { + return defaultValue; + } + String value =3D null; + if ( key.startsWith("org.apache.cocoon.") ) { + final String sKey =3D key.substring("org.apache.cocoon.".lengt= h()); + if ( sKey.equals("init.classloader") ) { + value =3D String.valueOf(this.initClassloader); + } else if ( sKey.equals("configuration") ) { + value =3D this.configuration; + } else if ( sKey.equals("logging.configuration") ) { + value =3D this.loggingConfiguration; + } else if ( sKey.equals("logging.logger.access") ) { + value =3D this.accessLogger; + } else if ( sKey.equals("logging.logger.cocoon") ) { + value =3D this.cocoonLogger; + } else if ( sKey.equals("logging.bootstrap.level") ) { + value =3D this.bootstrapLogLevel; + } else if ( sKey.equals("logging.manager.class") ) { + value =3D this.loggerClassName; + } else if ( sKey.equals("logging.log4j.configuration") ) { + value =3D this.log4jConfiguration; + } else if ( sKey.equals("allow.reload") ) { + value =3D String.valueOf(this.allowReload); + } else if ( sKey.equals("uploads.enable") ) { + value =3D String.valueOf(this.enableUploads); + } else if ( sKey.equals("uploads.directory") ) { + value =3D this.uploadDirectory =3D value; + } else if ( sKey.equals("uploads.autosave") ) { + value =3D String.valueOf(this.autosaveUploads); + } else if ( sKey.equals("uploads.overwrite") ) { + value =3D this.overwriteUploads; + } else if ( sKey.equals("uploads.maxsize") ) { + value =3D String.valueOf(this.maxUploadSize); + } else if ( sKey.equals("cache.directory") ) { + value =3D this.cacheDirectory; + } else if ( sKey.equals("work.directory") ) { + value =3D this.workDirectory; + } else if ( sKey.equals("parentservicemanager") ) { + value =3D this.parentServiceManagerClassName; + } else if ( sKey.equals("showtime") ) { + value =3D String.valueOf(this.showTime); + } else if ( sKey.equals("hideshowtime") ) { + value =3D String.valueOf(this.hideShowTime); + } else if ( sKey.equals("manageexceptions") ) { + value =3D String.valueOf(this.manageExceptions); + } else if ( sKey.equals("formencoding") ) { + value =3D this.formEncoding; + } else if ( sKey.equals("override.loglevel") ) { + value =3D this.overrideLogLevel; + } + } + + int i =3D 0; + while ( i < this.properties.size() && value =3D=3D null ) { + final Properties p =3D (Properties)this.properties.get(i); + value =3D p.getProperty(key); + i++; + } + if ( value =3D=3D null ) { + value =3D defaultValue; + } + return value; } } Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/co= coon/core/Core.java?view=3Ddiff&r1=3D149416&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/Core.java Tue Feb 1 = 09:01:45 2005 @@ -20,13 +20,21 @@ import java.util.Iterator; import java.util.List; =20 +import org.apache.avalon.framework.CascadingRuntimeException; +import org.apache.avalon.framework.context.Context; +import org.apache.avalon.framework.context.ContextException; +import org.apache.cocoon.configuration.Settings; + /** * The Core *=20 - * @version SVN $Id:$ + * @version SVN $Id$ */ public class Core { =20 + /** Application Context Key for the settings @since 2.2 */ + public static final String CONTEXT_SETTINGS =3D "settings"; + private static final ThreadLocal cleanup =3D new InheritableThreadLoca= l(); =20 public static void addCleanupTask(CleanupTask task) { @@ -49,8 +57,25 @@ l.clear(); } } + =20 public static interface CleanupTask { =20 void invoke(); } + =20 + /** + * Return the current response + * @param context The component context + * @return The response + * @since 2.2 + */ + public static final Settings getSettings(Context context) { + // the settings object is always present + try { + return (Settings)context.get(CONTEXT_SETTINGS); + } catch (ContextException ce) { + throw new CascadingRuntimeException("Unable to get the setting= s object from the context.", ce); + } + } + =20 } Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/Compo= nentEnvironment.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/co= coon/core/container/ComponentEnvironment.java?view=3Ddiff&r1=3D149416&r2=3D= 149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEn= vironment.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentEn= vironment.java Tue Feb 1 09:01:45 2005 @@ -25,6 +25,8 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.cocoon.components.ComponentInfo; import org.apache.cocoon.configuration.ConfigurationBuilder; +import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Core; =20 /** * The component enviromnent contains all objects necessary to create @@ -71,7 +73,8 @@ ComponentInfo ci =3D null; final InputStream is =3D this.classLoader.getResourceAsStream(bu.t= oString()); if ( is !=3D null ) { - final ConfigurationBuilder cb =3D new ConfigurationBuilder(); + final Settings settings =3D Core.getSettings(this.context); + final ConfigurationBuilder cb =3D new ConfigurationBuilder(set= tings); final Configuration conf =3D cb.build(is); ci =3D new ComponentInfo(); ci.fill(conf); Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreS= erviceManager.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/co= coon/core/container/CoreServiceManager.java?view=3Ddiff&r1=3D149416&r2=3D14= 9417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreService= Manager.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CoreService= Manager.java Tue Feb 1 09:01:45 2005 @@ -44,6 +44,8 @@ import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.components.ComponentInfo; import org.apache.cocoon.configuration.ConfigurationBuilder; +import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Core; import org.apache.cocoon.core.container.handler.AbstractComponentHandler; import org.apache.cocoon.core.container.handler.AliasComponentHandler; import org.apache.cocoon.core.container.handler.ComponentHandler; @@ -715,7 +717,8 @@ // load it and store it in the read set Configuration includeConfig =3D null; try { - ConfigurationBuilder builder =3D new ConfigurationBuil= der(); + final Settings settings =3D Core.getSettings(context); + ConfigurationBuilder builder =3D new ConfigurationBuil= der(settings); includeConfig =3D builder.build(src.getInputStream(), = uri); } catch (ConfigurationException ce) { throw ce; Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/util/= PropertyHelper.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/co= coon/core/container/util/PropertyHelper.java?view=3Ddiff&r1=3D149416&r2=3D1= 49417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/util/Proper= tyHelper.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/util/Proper= tyHelper.java Tue Feb 1 09:01:45 2005 @@ -16,6 +16,8 @@ */ package org.apache.cocoon.core.container.util; =20 +import org.apache.cocoon.configuration.Settings; + /** * Helper class for replacing property references with the value of the * property @@ -24,11 +26,11 @@ */ public class PropertyHelper { =20 - /** + /** * Replace all property references in the string with the current value * and return it. */ - public static String replace(String value) { + public static String replace(String value, Settings settings) { // quick test for null or no references if ( value =3D=3D null || value.indexOf("${") =3D=3D -1 ) { return value; @@ -64,7 +66,7 @@ prev =3D value.length(); } else { final String propertyName =3D value.substring(pos + 2,= endName); - String propertyValue =3D getProperty(propertyName); + String propertyValue =3D getProperty(propertyName, set= tings); // compatibility fallback - if the value is null, just= readd token if (propertyValue =3D=3D null) { buffer.append("${"); @@ -85,7 +87,14 @@ return buffer.toString(); } =20 - static String getProperty(String name) { - return System.getProperty(name); =20 + static String getProperty(String name, Settings settings) { + String value =3D null; + if ( settings !=3D null ) { + value =3D settings.getProperty(name); + } + if ( value =3D=3D null ) { + value =3D System.getProperty(name); + } + return value; } } Modified: cocoon/trunk/src/core/test/org/apache/cocoon/core/container/util/= PropertyHelperTestCase.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/test/org/apache/co= coon/core/container/util/PropertyHelperTestCase.java?view=3Ddiff&r1=3D14941= 6&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/core/test/org/apache/cocoon/core/container/util/Proper= tyHelperTestCase.java (original) +++ cocoon/trunk/src/core/test/org/apache/cocoon/core/container/util/Proper= tyHelperTestCase.java Tue Feb 1 09:01:45 2005 @@ -31,11 +31,11 @@ final String testC =3D "and this is the } end token"; final String testD =3D "${this.does.not.exists}"; // some tests for not! replacing - assertEquals(PropertyHelper.replace(testA), testA); - assertEquals(PropertyHelper.replace(testB), testB); - assertEquals(PropertyHelper.replace(testC), testC); - assertEquals(PropertyHelper.replace(testD), testD); + assertEquals(PropertyHelper.replace(testA, null), testA); + assertEquals(PropertyHelper.replace(testB, null), testB); + assertEquals(PropertyHelper.replace(testC, null), testC); + assertEquals(PropertyHelper.replace(testD, null), testD); // and finally we have something to replace - assertEquals(PropertyHelper.replace("${java.home}"), System.getPro= perty("java.home")); + assertEquals(PropertyHelper.replace("${java.home}", null), System.= getProperty("java.home")); } } Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/= Cocoon.java?view=3Ddiff&r1=3D149416&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Tue Feb 1 09:01:45= 2005 @@ -42,6 +42,8 @@ import org.apache.cocoon.components.source.SourceUtil; import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrappe= r; import org.apache.cocoon.configuration.ConfigurationBuilder; +import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Core; import org.apache.cocoon.core.container.RoleManager; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.ObjectModelHelper; @@ -251,7 +253,8 @@ private void configure() throws Exception { InputSource is =3D SourceUtil.getInputSource(this.configurationFil= e); =20 - ConfigurationBuilder builder =3D new ConfigurationBuilder(); + final Settings settings =3D Core.getSettings(context); + ConfigurationBuilder builder =3D new ConfigurationBuilder(settings= ); Configuration conf =3D builder.build(is); =20 if (getLogger().isDebugEnabled()) { Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/= bean/CocoonWrapper.java?view=3Ddiff&r1=3D149416&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java (origin= al) +++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Tue Feb= 1 09:01:45 2005 @@ -43,6 +43,8 @@ import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.ContextHelper; +import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Core; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.commandline.CommandLineContext; import org.apache.cocoon.environment.commandline.FileSavingEnvironment; @@ -158,6 +160,8 @@ appContext.put(Constants.CONTEXT_CONFIG_URL, conf.toURL()); appContext.put(Constants.CONTEXT_DEFAULT_ENCODING, "ISO-8859-1= "); appContext.put(ContextHelper.CONTEXT_ROOT_URL, this.context.to= URL().toExternalForm()); + // FIXME - add settings + appContext.put(Core.CONTEXT_SETTINGS, new Settings()); =20 loadClasses(classList); =20 Modified: cocoon/trunk/src/java/org/apache/cocoon/components/ContextHelper.= java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/= components/ContextHelper.java?view=3Ddiff&r1=3D149416&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/java/org/apache/cocoon/components/ContextHelper.java (= original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/ContextHelper.java T= ue Feb 1 09:01:45 2005 @@ -112,4 +112,5 @@ throw new CascadingRuntimeException("Unable to get the service= manager from the context.", ce); } =20 } + } Modified: cocoon/trunk/src/java/org/apache/cocoon/components/container/Logg= ingHelper.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/= components/container/LoggingHelper.java?view=3Ddiff&r1=3D149416&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHel= per.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/container/LoggingHel= per.java Tue Feb 1 09:01:45 2005 @@ -114,7 +114,7 @@ Source source =3D null; try { source =3D resolver.resolveURI(logkitConfig); - final ConfigurationBuilder builder =3D new Configurati= onBuilder(); + final ConfigurationBuilder builder =3D new Configurati= onBuilder(settings); final Configuration conf =3D builder.build(source.getI= nputStream()); final DefaultConfiguration categories =3D (DefaultConf= iguration)conf.getChild("categories"); final DefaultConfiguration targets =3D (DefaultConfigu= ration)conf.getChild("targets"); Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/= servlet/CocoonServlet.java?view=3Ddiff&r1=3D149416&r2=3D149417 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (ori= ginal) +++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Tue = Feb 1 09:01:45 2005 @@ -59,6 +59,7 @@ import org.apache.cocoon.components.notification.Notifier; import org.apache.cocoon.components.notification.Notifying; import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Core; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.http.HttpContext; import org.apache.cocoon.environment.http.HttpEnvironment; @@ -230,6 +231,7 @@ =20 // initialize settings this.settings =3D this.getSettings(); + this.appContext.put(Core.CONTEXT_SETTINGS, this.settings); =20 if (this.settings.isInitClassloader()) { // Force context classloader so that JAXP can work correctly @@ -427,6 +429,7 @@ try { Thread.currentThread().setContextClassLoader(this.classLoa= der); } catch (Exception e) { + // ignore this } } =20