Author: cziegeler Date: Fri Jan 21 02:24:30 2005 New Revision: 125914 URL: http://svn.apache.org/viewcvs?view=rev&rev=125914 Log: Remove dependency to cocoon servlet from the core Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseDeleteAction.java cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseSelectAction.java cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseUpdateAction.java cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java cocoon/trunk/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java&r1=125913&p2=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java (original) +++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAddAction.java Fri Jan 21 02:24:30 2005 @@ -32,7 +32,6 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; @@ -49,7 +48,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> * @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a> - * @version CVS $Id: DatabaseAddAction.java,v 1.4 2004/03/30 05:50:48 antonio Exp $ + * @version CVS $Id$ */ public class DatabaseAddAction extends AbstractDatabaseAction implements ThreadSafe { protected static final Map addStatements = new HashMap(); @@ -66,7 +65,7 @@ Map results = new HashMap(); // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); // read local parameter settings Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java&r1=125913&p2=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java (original) +++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseAuthenticatorAction.java Fri Jan 21 02:24:30 2005 @@ -19,7 +19,6 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Constants; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -71,7 +70,7 @@ * not verified. * * @author <a href="mailto:[EMAIL PROTECTED]">Martin Man</a> - * @version CVS $Id: DatabaseAuthenticatorAction.java,v 1.7 2004/03/30 05:50:48 antonio Exp $ + * @version CVS $Id$ */ public class DatabaseAuthenticatorAction extends AbstractDatabaseAction implements ThreadSafe { @@ -86,7 +85,7 @@ ResultSet rs = null; // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) { reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java&r1=125913&p2=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java (original) +++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java Fri Jan 21 02:24:30 2005 @@ -19,7 +19,6 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Constants; import org.apache.cocoon.components.language.markup.xsp.XSPCookieHelper; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; @@ -69,7 +68,7 @@ * parameter "append-session" to "yes" or "true". * * @author <a href="mailto:[EMAIL PROTECTED]">Paolo Scaffardi</a> - * @version CVS $Id: DatabaseCookieAuthenticatorAction.java,v 1.5 2004/03/30 01:12:47 antonio Exp $ + * @version CVS $Id$ */ public class DatabaseCookieAuthenticatorAction extends AbstractDatabaseAction implements ThreadSafe { @@ -93,7 +92,7 @@ ResultSet rs = null; // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) { reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseDeleteAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseDeleteAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseDeleteAction.java&r1=125913&p2=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseDeleteAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseDeleteAction.java (original) +++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseDeleteAction.java Fri Jan 21 02:24:30 2005 @@ -20,7 +20,6 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; @@ -41,7 +40,7 @@ * the keys. * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Id: DatabaseDeleteAction.java,v 1.3 2004/03/30 05:50:48 antonio Exp $ + * @version CVS $Id$ */ public final class DatabaseDeleteAction extends AbstractDatabaseAction implements ThreadSafe { private static final Map deleteStatements = new HashMap(); @@ -57,7 +56,7 @@ int currentIndex = 0; // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); // read local parameter settings Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseSelectAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseSelectAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseSelectAction.java&r1=125913&p2=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseSelectAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseSelectAction.java (original) +++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseSelectAction.java Fri Jan 21 02:24:30 2005 @@ -20,7 +20,6 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; @@ -42,7 +41,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> * @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a> - * @version CVS $Id: DatabaseSelectAction.java,v 1.3 2004/03/30 05:50:48 antonio Exp $ + * @version CVS $Id$ */ public class DatabaseSelectAction extends AbstractDatabaseAction implements ThreadSafe { @@ -59,7 +58,7 @@ int currentIndex = 0; // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); // read local parameter settings Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseUpdateAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseUpdateAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseUpdateAction.java&r1=125913&p2=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseUpdateAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseUpdateAction.java (original) +++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/DatabaseUpdateAction.java Fri Jan 21 02:24:30 2005 @@ -20,7 +20,6 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; @@ -38,7 +37,7 @@ * only one table at a time to update. * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Id: DatabaseUpdateAction.java,v 1.3 2004/03/30 05:50:48 antonio Exp $ + * @version CVS $Id$ */ public class DatabaseUpdateAction extends AbstractDatabaseAction implements ThreadSafe { private static final Map updateStatements = new HashMap(); @@ -54,7 +53,7 @@ int currentIndex = 0; // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); // read local parameter settings Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java&r1=125913&p2=cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java (original) +++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/acting/modular/DatabaseAction.java Fri Jan 21 02:24:30 2005 @@ -33,7 +33,6 @@ import org.apache.avalon.framework.service.ServiceSelector; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.acting.AbstractComplementaryConfigurableAction; import org.apache.cocoon.components.modules.database.AutoIncrementModule; @@ -87,7 +86,7 @@ * </table> * * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> - * @version CVS $Id: DatabaseAction.java,v 1.8 2004/04/27 22:23:08 haul Exp $ + * @version CVS $Id$ * @see org.apache.cocoon.components.modules.input * @see org.apache.cocoon.components.modules.output * @see org.apache.cocoon.components.modules.database @@ -629,7 +628,7 @@ boolean failed = false; // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; // call specific default modes apart from output mode are not supported // set request attribute Modified: cocoon/trunk/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java&r1=125913&p2=cocoon/trunk/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java (original) +++ cocoon/trunk/src/blocks/xmldb/java/org/apache/cocoon/acting/DbXMLAuthenticatorAction.java Fri Jan 21 02:24:30 2005 @@ -19,7 +19,6 @@ import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Constants; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.Request; @@ -86,7 +85,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Christian Zoffoli</a> * @author <a href="mailto:[EMAIL PROTECTED]">Martin Man</a> * @since 2002/02/03 - * @version CVS $Id: DbXMLAuthenticatorAction.java,v 1.7 2004/03/28 20:51:24 antonio Exp $ + * @version CVS $Id$ * * based on DatabaseAuthenticatorAction created by Martin Man <[EMAIL PROTECTED]> */ @@ -102,7 +101,7 @@ ResourceSet rs = null; // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) { reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); Modified: cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java?view=diff&rev=125914&p1=cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java&r1=125913&p2=cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java&r2=125914 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/Constants.java Fri Jan 21 02:24:30 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import java.util.Properties; /** - * The <code>Constants</code> use throughout the core of the Cocoon engine. + * The <code>Constants</code> used throughout the core of the Cocoon engine. * * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a> * @author <a href="mailto:[EMAIL PROTECTED]">Peter Royal</a> @@ -281,14 +281,6 @@ /** Application <code>Context</code> Key for the default encoding */ public static final String CONTEXT_DEFAULT_ENCODING = "default-encoding"; - - - /** - * Should descriptors be reloaded? - * - * FIXME(GP): Isn't this Action specific only? - */ - public static final boolean DESCRIPTOR_RELOADABLE_DEFAULT = true; } Modified: cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java?view=diff&rev=125914&p1=cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java&r1=125913&p2=cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java&r2=125914 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java Fri Jan 21 02:24:30 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,6 @@ import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.Constants; import org.apache.cocoon.environment.Context; -import org.apache.cocoon.servlet.CocoonServlet; import org.apache.commons.lang.BooleanUtils; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceException; @@ -85,7 +84,7 @@ throws ContextException { this.envContext = (Context)context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT); try { - this.servletContext = ((ServletConfig) context.get(CocoonServlet.CONTEXT_SERVLET_CONFIG)).getServletContext(); + this.servletContext = ((ServletConfig) context.get("servlet-config")).getServletContext(); } catch (ContextException ignore) { // in other environments (CLI etc.), we don't have a servlet context } Modified: cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java?view=diff&rev=125914&p1=cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java&r1=125913&p2=cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java&r2=125914 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/configuration/ConfigurationBuilder.java Fri Jan 21 02:24:30 2005 @@ -95,17 +95,10 @@ private Locator locator; private final NamespaceSupport namespaceSupport = new NamespaceSupport(); - private final boolean processIncludes; - /** * Create a Configuration Builder */ public ConfigurationBuilder() { - this(false); - } - - public ConfigurationBuilder(boolean processIncludes) { - this.processIncludes = processIncludes; try { final SAXParserFactory saxParserFactory = SAXParserFactory.newInstance(); Modified: cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java?view=diff&rev=125914&p1=cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java&r1=125913&p2=cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java&r2=125914 ============================================================================== --- cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java (original) +++ cocoon/trunk/src/core/java/org/apache/cocoon/environment/Context.java Fri Jan 21 02:24:30 2005 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. + * Copyright 1999-2005 The Apache Software Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import java.io.InputStream; /** - * Defines an interface to provide client context information . + * Defines an interface to provide context information. * * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a> * @version CVS $Id$ Modified: cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java&r1=125913&p2=cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java Fri Jan 21 02:24:30 2005 @@ -18,7 +18,6 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.SAXConfigurationHandler; -import org.apache.cocoon.Constants; import org.apache.cocoon.components.source.SourceUtil; import org.apache.cocoon.environment.SourceResolver; import org.apache.excalibur.source.Source; @@ -34,9 +33,15 @@ * effective. The name of the root configuration element is irrelevant. * * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Id: AbstractComplementaryConfigurableAction.java,v 1.5 2004/05/27 13:14:36 cziegeler Exp $ + * @version CVS $Id$ */ public abstract class AbstractComplementaryConfigurableAction extends ConfigurableServiceableAction { + + /** + * Should descriptors be reloaded? + */ + public static final boolean DESCRIPTOR_RELOADABLE_DEFAULT = true; + private static Map configurations = new HashMap(); /** @@ -48,7 +53,7 @@ * Defaults to reload configuration file it has changed. */ protected Configuration getConfiguration(String descriptor) throws ConfigurationException { - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); return this.getConfiguration(descriptor, null, reloadable); Modified: cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java?view=diff&rev=125914&p1=cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java&r1=125913&p2=cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java&r2=125914 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java Fri Jan 21 02:24:30 2005 @@ -187,7 +187,7 @@ * </table> * @author <a href="mailto:[EMAIL PROTECTED]">Martin Man</a> * @author <a href="mailto:[EMAIL PROTECTED]">Christian Haul</a> - * @version CVS $Id: AbstractValidatorAction.java,v 1.12 2004/04/03 03:01:35 joerg Exp $ + * @version CVS $Id$ */ public abstract class AbstractValidatorAction extends AbstractComplementaryConfigurableAction @@ -944,7 +944,7 @@ */ protected boolean isDescriptorReloadable() { // read global parameter settings - boolean reloadable = Constants.DESCRIPTOR_RELOADABLE_DEFAULT; + boolean reloadable = DESCRIPTOR_RELOADABLE_DEFAULT; if (this.settings.containsKey("reloadable")) { reloadable = Boolean.valueOf((String) this.settings.get("reloadable")).booleanValue(); }
