Author: cziegeler Date: Fri Apr 22 00:40:52 2005 New Revision: 164184 URL: http://svn.apache.org/viewcvs?rev=164184&view=rev Log: Move settings to core and make it read-only
Added: cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java - copied, changed from r164178, cocoon/trunk/src/java/org/apache/cocoon/configuration/Settings.java Removed: cocoon/trunk/src/java/org/apache/cocoon/configuration/Settings.java Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java cocoon/trunk/src/java/org/apache/cocoon/Constants.java cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java cocoon/trunk/src/java/org/apache/cocoon/configuration/ConfigurationBuilder.java cocoon/trunk/src/java/org/apache/cocoon/core/BootstrapEnvironment.java cocoon/trunk/src/java/org/apache/cocoon/core/Core.java cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentEnvironment.java cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java cocoon/trunk/src/java/org/apache/cocoon/core/container/util/PropertyHelper.java cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java cocoon/trunk/src/test/org/apache/cocoon/core/container/ContainerTestCase.java 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?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Fri Apr 22 00:40:52 2005 @@ -38,8 +38,8 @@ import org.apache.cocoon.components.source.SourceUtil; import org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper; import org.apache.cocoon.configuration.ConfigurationBuilder; -import org.apache.cocoon.configuration.Settings; import org.apache.cocoon.core.Core; +import org.apache.cocoon.core.Settings; import org.apache.cocoon.core.container.RoleManager; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.ObjectModelHelper; Modified: cocoon/trunk/src/java/org/apache/cocoon/Constants.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/Constants.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/Constants.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/Constants.java Fri Apr 22 00:40:52 2005 @@ -214,12 +214,12 @@ /** * Application <code>Context</code> Key for the URL to the configuration file * (usually named cocoon.xconf) - * @deprecated Use [EMAIL PROTECTED] org.apache.cocoon.configuration.Settings#getConfiguration()}. + * @deprecated Use [EMAIL PROTECTED] org.apache.cocoon.core.Settings#getConfiguration()}. */ public static final String CONTEXT_CONFIG_URL = "config-url"; /** Application <code>Context</code> Key for the default encoding. - * @deprecated Use [EMAIL PROTECTED] org.apache.cocoon.configuration.Settings#getFormEncoding()}. */ + * @deprecated Use [EMAIL PROTECTED] org.apache.cocoon.core.Settings#getFormEncoding()}. */ public static final String CONTEXT_DEFAULT_ENCODING = "default-encoding"; } 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?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Fri Apr 22 00:40:52 2005 @@ -44,8 +44,8 @@ import org.apache.cocoon.ProcessingException; import org.apache.cocoon.Processor; import org.apache.cocoon.components.ContextHelper; -import org.apache.cocoon.configuration.Settings; import org.apache.cocoon.core.Core; +import org.apache.cocoon.core.Settings; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.commandline.CommandLineContext; import org.apache.cocoon.environment.commandline.FileSavingEnvironment; Modified: cocoon/trunk/src/java/org/apache/cocoon/configuration/ConfigurationBuilder.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/configuration/ConfigurationBuilder.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/configuration/ConfigurationBuilder.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/configuration/ConfigurationBuilder.java Fri Apr 22 00:40:52 2005 @@ -27,6 +27,7 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; +import org.apache.cocoon.core.Settings; import org.apache.cocoon.core.container.util.PropertyHelper; import org.xml.sax.Attributes; import org.xml.sax.EntityResolver; Modified: cocoon/trunk/src/java/org/apache/cocoon/core/BootstrapEnvironment.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/BootstrapEnvironment.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/core/BootstrapEnvironment.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/core/BootstrapEnvironment.java Fri Apr 22 00:40:52 2005 @@ -22,7 +22,6 @@ import org.apache.avalon.framework.context.DefaultContext; import org.apache.avalon.framework.logger.Logger; -import org.apache.cocoon.configuration.Settings; import org.apache.log.LogTarget; /** @@ -33,7 +32,7 @@ * A BootstrapEnvironment can be used to create a new Cocoon system using * the [EMAIL PROTECTED] CoreUtil}. * -* @version SVN $Id:$ +* @version SVN $Id$ * @since 2.2 */ public interface BootstrapEnvironment { Modified: cocoon/trunk/src/java/org/apache/cocoon/core/Core.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/Core.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/core/Core.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/core/Core.java Fri Apr 22 00:40:52 2005 @@ -27,7 +27,6 @@ import org.apache.avalon.framework.context.ContextException; import org.apache.cocoon.Constants; import org.apache.cocoon.components.ContextHelper; -import org.apache.cocoon.configuration.Settings; /** * This is the core Cocoon component. Modified: cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/core/CoreUtil.java Fri Apr 22 00:40:52 2005 @@ -48,7 +48,6 @@ import org.apache.cocoon.Constants; import org.apache.cocoon.components.ContextHelper; import org.apache.cocoon.configuration.ConfigurationBuilder; -import org.apache.cocoon.configuration.Settings; import org.apache.cocoon.core.source.SimpleSourceResolver; import org.apache.cocoon.matching.helpers.WildcardHelper; import org.apache.cocoon.util.ClassUtils; @@ -252,6 +251,9 @@ // create parent service manager this.parentManager = this.getParentServiceManager(core); + + // settings can't be changed anymore + settings.makeReadOnly(); } public Core getCore() { Copied: cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java (from r164178, cocoon/trunk/src/java/org/apache/cocoon/configuration/Settings.java) URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java?p2=cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java&p1=cocoon/trunk/src/java/org/apache/cocoon/configuration/Settings.java&r1=164178&r2=164184&rev=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/configuration/Settings.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/core/Settings.java Fri Apr 22 00:40:52 2005 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.cocoon.configuration; +package org.apache.cocoon.core; import java.util.ArrayList; import java.util.HashMap; @@ -32,6 +32,8 @@ */ public class Settings { + protected boolean readOnly = false; + /** Prefix for properties */ protected static final String KEYPREFIX = "org.apache.cocoon."; @@ -291,6 +293,7 @@ * Fill from a properties object */ public void fill(Properties props) { + this.checkWriteable(); if ( props != null ) { final Iterator i = props.entrySet().iterator(); while ( i.hasNext() ) { @@ -365,8 +368,10 @@ * @param hideShowTime The hideShowTime to set. */ public void setHideShowTime(boolean hideShowTime) { + this.checkWriteable(); this.hideShowTime = hideShowTime; } + /** * @return Returns the allowReload. */ @@ -377,78 +382,97 @@ * @param allowReload The allowReload to set. */ public void setAllowReload(boolean allowReload) { + this.checkWriteable(); this.allowReload = allowReload; } + /** * @return Returns the autosaveUploads. */ public boolean isAutosaveUploads() { return this.autosaveUploads; } + /** * @param autosaveUploads The autosaveUploads to set. */ public void setAutosaveUploads(boolean autosaveUploads) { + this.checkWriteable(); this.autosaveUploads = autosaveUploads; } + /** * @return Returns the cacheDirectory. */ public String getCacheDirectory() { return this.cacheDirectory; } + /** * @param cacheDirectory The cacheDirectory to set. */ public void setCacheDirectory(String cacheDirectory) { + this.checkWriteable(); this.cacheDirectory = cacheDirectory; } + /** * @return Returns the cocoonLogger. */ public String getCocoonLogger() { return this.cocoonLogger; } + /** * @param cocoonLogger The cocoonLogger to set. */ public void setCocoonLogger(String cocoonLogger) { + this.checkWriteable(); this.cocoonLogger = cocoonLogger; } + /** * @return Returns the configuration. */ public String getConfiguration() { return this.configuration; } + /** * @param configuration The configuration to set. */ public void setConfiguration(String configuration) { + this.checkWriteable(); this.configuration = configuration; } + /** * @return Returns the enableUploads. */ public boolean isEnableUploads() { return this.enableUploads; } + /** * @param enableUploads The enableUploads to set. */ public void setEnableUploads(boolean enableUploads) { + this.checkWriteable(); this.enableUploads = enableUploads; } + /** * @return Returns the extraClasspaths. */ public List getExtraClasspaths() { return this.extraClasspaths; } + /** * @param extraClasspath The extraClasspaths to set. */ public void addToExtraClasspaths(String extraClasspath) { + this.checkWriteable(); this.extraClasspaths.add(extraClasspath); } @@ -464,6 +488,7 @@ * @param value The forceProperties value to set. */ public void addToForceProperties(String key, String value) { + this.checkWriteable(); this.forceProperties.put(key, value); } @@ -473,22 +498,27 @@ public String getFormEncoding() { return this.formEncoding; } + /** * @param formEncoding The formEncoding to set. */ public void setFormEncoding(String formEncoding) { + this.checkWriteable(); this.formEncoding = formEncoding; } + /** * @return Returns the initClassloader. */ public boolean isInitClassloader() { return this.initClassloader; } + /** * @param initClassloader The initClassloader to set. */ public void setInitClassloader(boolean initClassloader) { + this.checkWriteable(); this.initClassloader = initClassloader; } @@ -503,6 +533,7 @@ * @param className The loadClasses to set. */ public void addToLoadClasses(String className) { + this.checkWriteable(); this.loadClasses.add(className); } @@ -512,119 +543,148 @@ public String getLoggerClassName() { return this.loggerClassName; } + /** * @param loggerClassName The loggerClassName to set. */ public void setLoggerClassName(String loggerClassName) { + this.checkWriteable(); this.loggerClassName = loggerClassName; } + /** * @return Returns the loggingConfiguration. */ public String getLoggingConfiguration() { return this.loggingConfiguration; } + /** * @param loggingConfiguration The loggingConfiguration to set. */ public void setLoggingConfiguration(String loggingConfiguration) { + this.checkWriteable(); this.loggingConfiguration = loggingConfiguration; } + /** * @return Returns the logLevel. */ public String getBootstrapLogLevel() { return this.bootstrapLogLevel; } + /** * @param logLevel The logLevel to set. */ public void setBootstrapLogLevel(String logLevel) { + this.checkWriteable(); this.bootstrapLogLevel = logLevel; } + /** * @return Returns the manageExceptions. */ public boolean isManageExceptions() { return this.manageExceptions; } + /** * @param manageExceptions The manageExceptions to set. */ public void setManageExceptions(boolean manageExceptions) { + this.checkWriteable(); this.manageExceptions = manageExceptions; } + /** * @return Returns the maxUploadSize. */ public int getMaxUploadSize() { return this.maxUploadSize; } + /** * @param maxUploadSize The maxUploadSize to set. */ public void setMaxUploadSize(int maxUploadSize) { + this.checkWriteable(); this.maxUploadSize = maxUploadSize; } + /** * @return Returns the overwriteUploads. */ public String getOverwriteUploads() { return this.overwriteUploads; } + /** * @param overwriteUploads The overwriteUploads to set. */ public void setOverwriteUploads(String overwriteUploads) { + this.checkWriteable(); this.overwriteUploads = overwriteUploads; } + /** * @return Returns the parentServiceManagerClassName. */ public String getParentServiceManagerClassName() { return this.parentServiceManagerClassName; } + /** * @param parentServiceManagerClassName The parentServiceManagerClassName to set. */ public void setParentServiceManagerClassName( String parentServiceManagerClassName) { + this.checkWriteable(); this.parentServiceManagerClassName = parentServiceManagerClassName; } + /** * @return Returns the showTime. */ public boolean isShowTime() { return this.showTime; } + /** * @param showTime The showTime to set. */ public void setShowTime(boolean showTime) { + this.checkWriteable(); this.showTime = showTime; } + /** * @return Returns the uploadDirectory. */ public String getUploadDirectory() { return this.uploadDirectory; } + /** * @param uploadDirectory The uploadDirectory to set. */ public void setUploadDirectory(String uploadDirectory) { + this.checkWriteable(); this.uploadDirectory = uploadDirectory; } + /** * @return Returns the workDirectory. */ public String getWorkDirectory() { return this.workDirectory; } + /** * @param workDirectory The workDirectory to set. */ public void setWorkDirectory(String workDirectory) { + this.checkWriteable(); this.workDirectory = workDirectory; } @@ -634,10 +694,12 @@ public String getLog4jConfiguration() { return this.log4jConfiguration; } + /** * @param log4jConfiguration The log4jConfiguration to set. */ public void setLog4jConfiguration(String log4jConfiguration) { + this.checkWriteable(); this.log4jConfiguration = log4jConfiguration; } @@ -647,10 +709,12 @@ public String getAccessLogger() { return this.accessLogger; } + /** * @param servletLogger The servletLogger to set. */ public void setAccessLogger(String servletLogger) { + this.checkWriteable(); this.accessLogger = servletLogger; } @@ -665,6 +729,7 @@ * @param overrideLogLevel The overrideLogLevel to set. */ public void setOverrideLogLevel(String overrideLogLevel) { + this.checkWriteable(); this.overrideLogLevel = overrideLogLevel; } @@ -701,6 +766,7 @@ * @param configurationReloadDelay The configurationReloadDelay to set. */ public void setConfigurationReloadDelay(long configurationReloadDelay) { + this.checkWriteable(); this.configurationReloadDelay = configurationReloadDelay; } @@ -715,10 +781,11 @@ * @param lazyMode The lazyMode to set. */ public void setLazyMode(boolean lazyMode) { + this.checkWriteable(); this.lazyMode = lazyMode; } - /* (non-Javadoc) + /** * @see java.lang.Object#toString() */ public String toString() { @@ -812,7 +879,7 @@ } else if ( sKey.equals(KEY_LAZY_MODE) ) { value = String.valueOf(this.lazyMode); } - } + } int i = 0; while ( i < this.properties.size() && value == null ) { @@ -825,4 +892,25 @@ } return value; } + + /** + * Mark this object as read-only. + */ + public void makeReadOnly() { + this.readOnly = false; + } + + /** + * check if this configuration is writeable. + * + * @throws IllegalStateException if this setting is read-only + */ + protected final void checkWriteable() + throws IllegalStateException { + if( this.readOnly ) { + throw new IllegalStateException + ( "Settings is read only and can not be modified" ); + } + } + } Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentEnvironment.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentEnvironment.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentEnvironment.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentEnvironment.java Fri Apr 22 00:40:52 2005 @@ -26,8 +26,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; +import org.apache.cocoon.core.Settings; /** * The component enviromnent contains all objects necessary to create Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentFactory.java Fri Apr 22 00:40:52 2005 @@ -25,8 +25,8 @@ import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.cocoon.components.ComponentInfo; -import org.apache.cocoon.configuration.Settings; import org.apache.cocoon.core.Core; +import org.apache.cocoon.core.Settings; /** * Factory for Avalon based components. Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java Fri Apr 22 00:40:52 2005 @@ -44,8 +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.Settings; import org.apache.cocoon.core.container.handler.AbstractComponentHandler; import org.apache.cocoon.core.container.handler.AliasComponentHandler; import org.apache.cocoon.core.container.handler.ComponentHandler; Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/util/PropertyHelper.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/util/PropertyHelper.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/core/container/util/PropertyHelper.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/core/container/util/PropertyHelper.java Fri Apr 22 00:40:52 2005 @@ -16,7 +16,7 @@ */ package org.apache.cocoon.core.container.util; -import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Settings; /** * Helper class for replacing property references with the value of the Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java Fri Apr 22 00:40:52 2005 @@ -30,8 +30,8 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.cocoon.Constants; -import org.apache.cocoon.configuration.Settings; import org.apache.cocoon.core.Core; +import org.apache.cocoon.core.Settings; import org.apache.commons.lang.SystemUtils; import org.apache.excalibur.store.Store; import org.apache.excalibur.store.StoreJanitor; Modified: cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java Fri Apr 22 00:40:52 2005 @@ -20,7 +20,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.cocoon.Constants; import org.apache.cocoon.caching.CacheableProcessingComponent; -import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Settings; import org.apache.cocoon.util.ClassUtils; import org.apache.cocoon.util.TraxErrorHandler; import org.apache.cocoon.xml.AbstractXMLPipe; 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?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/servlet/CocoonServlet.java Fri Apr 22 00:40:52 2005 @@ -49,9 +49,9 @@ 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.BootstrapEnvironment; import org.apache.cocoon.core.CoreUtil; +import org.apache.cocoon.core.Settings; import org.apache.cocoon.environment.Context; import org.apache.cocoon.environment.Environment; import org.apache.cocoon.environment.http.HttpContext; Modified: cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/servlet/SettingsHelper.java Fri Apr 22 00:40:52 2005 @@ -19,7 +19,7 @@ import javax.servlet.ServletConfig; -import org.apache.cocoon.configuration.Settings; +import org.apache.cocoon.core.Settings; import org.apache.cocoon.util.StringUtils; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.SystemUtils; Modified: cocoon/trunk/src/test/org/apache/cocoon/core/container/ContainerTestCase.java URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/core/container/ContainerTestCase.java?rev=164184&r1=164183&r2=164184&view=diff ============================================================================== --- cocoon/trunk/src/test/org/apache/cocoon/core/container/ContainerTestCase.java (original) +++ cocoon/trunk/src/test/org/apache/cocoon/core/container/ContainerTestCase.java Fri Apr 22 00:40:52 2005 @@ -36,9 +36,9 @@ import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; -import org.apache.cocoon.configuration.Settings; import org.apache.cocoon.core.Core; import org.apache.cocoon.core.CoreUtil; +import org.apache.cocoon.core.Settings; import org.apache.cocoon.util.log.DeprecationLogger; /**