Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 82704 invoked from network); 8 Jan 2006 14:13:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 8 Jan 2006 14:13:44 -0000 Received: (qmail 5082 invoked by uid 500); 8 Jan 2006 14:13:43 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 5020 invoked by uid 500); 8 Jan 2006 14:13:42 -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 5009 invoked by uid 99); 8 Jan 2006 14:13:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2006 06:13:42 -0800 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, 08 Jan 2006 06:13:39 -0800 Received: (qmail 82589 invoked by uid 65534); 8 Jan 2006 14:13:19 -0000 Message-ID: <20060108141319.82588.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r367030 - in /cocoon: blocks/forms/trunk/java/org/apache/cocoon/forms/acting/ blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/ blocks/forms/trunk/java/org/apache/cocoon/forms/util/ branches/BRANCH_2_1_X/src/java/org/apache/co... Date: Sun, 08 Jan 2006 14:13:09 -0000 To: cvs@cocoon.apache.org From: antonio@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: antonio Date: Sun Jan 8 06:12:32 2006 New Revision: 367030 URL: http://svn.apache.org/viewcvs?rev=367030&view=rev Log: Remove redundancy, superclass already implements this interfaces. Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Main.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/ProcessingException.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/EnvironmentStack.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractRegexpSelector.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/RequestParameterSelector.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/SimpleSelector.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/XPathExceptionSelector.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/IncludeTransformer.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java (original) +++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/acting/HandleFormSubmitAction.java Sun Jan 8 06:12:32 2006 @@ -15,9 +15,7 @@ */ package org.apache.cocoon.forms.acting; -import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.acting.Action; import org.apache.cocoon.environment.Redirector; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.environment.Request; @@ -47,7 +45,7 @@ * * @version $Id$ */ -public class HandleFormSubmitAction extends AbstractFormsAction implements Action, ThreadSafe { +public class HandleFormSubmitAction extends AbstractFormsAction { public Map act(Redirector redirector, SourceResolver resolver, Map objectModel, String src, Parameters parameters) throws Exception { Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java (original) +++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java Sun Jan 8 06:12:32 2006 @@ -15,8 +15,6 @@ */ package org.apache.cocoon.forms.transformation; -import org.apache.avalon.excalibur.pool.Recyclable; - import org.apache.cocoon.forms.FormsConstants; import org.apache.cocoon.forms.formmodel.AggregateField; import org.apache.cocoon.forms.formmodel.DataWidget; @@ -938,8 +936,7 @@ * This ContentHandler helps in inserting SAX events before the closing tag of the root * element. */ - protected class StylingContentHandler extends AbstractXMLPipe - implements Recyclable { + protected class StylingContentHandler extends AbstractXMLPipe { private int elementNesting; private SaxBuffer styling; Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java (original) +++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/SimpleServiceSelector.java Sun Jan 8 06:12:32 2006 @@ -24,7 +24,6 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.AbstractLogEnabled; -import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.ServiceSelector; @@ -39,7 +38,7 @@ * * @version $Id$ */ -public class SimpleServiceSelector extends AbstractLogEnabled implements ServiceSelector, Configurable, LogEnabled, +public class SimpleServiceSelector extends AbstractLogEnabled implements ServiceSelector, Configurable, Serviceable, Disposable, Contextualizable { private final String hintShortHand; private final Class componentClass; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Main.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Main.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Main.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/Main.java Sun Jan 8 06:12:32 2006 @@ -228,104 +228,104 @@ printUsage(); } else if (line.hasOption(VERSION_OPT)) { printVersion(); - } - - String uriGroup = null; - if (line.hasOption(URI_GROUP_NAME_OPT)) { - uriGroup = line.getOptionValue(URI_GROUP_NAME_OPT); - } - - String destDir = null; - if (line.hasOption(XCONF_OPT)) { - // destDir from command line overrides one in xconf file - destDir = Main.processXConf(cocoon, line.getOptionValue(XCONF_OPT), destDir, uriGroup); - } - if (line.hasOption(DEST_DIR_OPT)) { - destDir = line.getOptionValue(DEST_DIR_OPT); - } - - if (line.hasOption(VERBOSE_OPT)) { - cocoon.setVerbose(true); - } - if (line.hasOption(PRECOMPILE_ONLY_OPT)) { - cocoon.setPrecompileOnly(true); - } - - if (line.hasOption(WORK_DIR_OPT)) { - String workDir = line.getOptionValue(WORK_DIR_OPT); - if (workDir.length() == 0) { - listener.messageGenerated( - "Careful, you must specify a work dir when using the -w/--workDir argument"); - System.exit(1); - } else { - cocoon.setWorkDir(line.getOptionValue(WORK_DIR_OPT)); + } else { + String uriGroup = null; + if (line.hasOption(URI_GROUP_NAME_OPT)) { + uriGroup = line.getOptionValue(URI_GROUP_NAME_OPT); } - } - if (line.hasOption(CONTEXT_DIR_OPT)) { - String contextDir = line.getOptionValue(CONTEXT_DIR_OPT); - if (contextDir.length() == 0) { - listener.messageGenerated( - "Careful, you must specify a configuration file when using the -c/--contextDir argument"); + + String destDir = null; + if (line.hasOption(XCONF_OPT)) { + // destDir from command line overrides one in xconf file + destDir = Main.processXConf(cocoon, line.getOptionValue(XCONF_OPT), destDir, uriGroup); + } + if (line.hasOption(DEST_DIR_OPT)) { + destDir = line.getOptionValue(DEST_DIR_OPT); + } + + if (line.hasOption(VERBOSE_OPT)) { + cocoon.setVerbose(true); + } + if (line.hasOption(PRECOMPILE_ONLY_OPT)) { + cocoon.setPrecompileOnly(true); + } + + if (line.hasOption(WORK_DIR_OPT)) { + String workDir = line.getOptionValue(WORK_DIR_OPT); + if (workDir.length() == 0) { + listener.messageGenerated( + "Careful, you must specify a work dir when using the -w/--workDir argument"); + System.exit(1); + } else { + cocoon.setWorkDir(line.getOptionValue(WORK_DIR_OPT)); + } + } + if (line.hasOption(CONTEXT_DIR_OPT)) { + String contextDir = line.getOptionValue(CONTEXT_DIR_OPT); + if (contextDir.length() == 0) { + listener.messageGenerated( + "Careful, you must specify a configuration file when using the -c/--contextDir argument"); + System.exit(1); + } else { + cocoon.setContextDir(contextDir); + } + } + if (line.hasOption(CONFIG_FILE_OPT)) { + cocoon.setConfigFile(line.getOptionValue(CONFIG_FILE_OPT)); + } + if (line.hasOption(LOG_KIT_OPT)) { + cocoon.setLogKit(line.getOptionValue(LOG_KIT_OPT)); + } + if (line.hasOption(LOGGER_OPT)) { + cocoon.setLogger(line.getOptionValue(LOGGER_OPT)); + } + if (line.hasOption(LOG_LEVEL_OPT)) { + cocoon.setLogLevel(line.getOptionValue(LOG_LEVEL_OPT)); + } + if (line.hasOption(AGENT_OPT)) { + cocoon.setAgentOptions(line.getOptionValue(AGENT_OPT)); + } + if (line.hasOption(ACCEPT_OPT)) { + cocoon.setAcceptOptions(line.getOptionValue(ACCEPT_OPT)); + } + if (line.hasOption(DEFAULT_FILENAME_OPT)) { + cocoon.setDefaultFilename(line.getOptionValue(DEFAULT_FILENAME_OPT)); + } + if (line.hasOption(BROKEN_LINK_FILE_OPT)) { + listener.setReportFile(line.getOptionValue(BROKEN_LINK_FILE_OPT)); + } + if (line.hasOption(FOLLOW_LINKS_OPT)) { + cocoon.setFollowLinks(BooleanUtils.toBoolean(line.getOptionValue(FOLLOW_LINKS_OPT))); + } + if (line.hasOption(CONFIRM_EXTENSIONS_OPT)) { + cocoon.setConfirmExtensions(BooleanUtils.toBoolean(line.getOptionValue(CONFIRM_EXTENSIONS_OPT, "yes"))); + } + if (line.hasOption(LOAD_CLASS_OPT)){ + cocoon.addLoadedClasses(Arrays.asList(line.getOptionValues(LOAD_CLASS_OPT))); + } + if (line.hasOption(URI_FILE_OPT)) { + cocoon.addTargets(BeanConfigurator.processURIFile(line.getOptionValue(URI_FILE_OPT)), destDir); + } + + cocoon.addTargets(line.getArgList(), destDir); + + listener.messageGenerated(CocoonBean.getProlog()); + + if (cocoon.getTargetCount() == 0 && cocoon.isPrecompileOnly()) { + listener.messageGenerated("Please, specify at least one starting URI."); System.exit(1); - } else { - cocoon.setContextDir(contextDir); } + + cocoon.initialize(); + cocoon.process(); + cocoon.dispose(); + + listener.complete(); + + + int exitCode = (listener.isSuccessful() ? 0 : 1); + System.exit(exitCode); } - if (line.hasOption(CONFIG_FILE_OPT)) { - cocoon.setConfigFile(line.getOptionValue(CONFIG_FILE_OPT)); - } - if (line.hasOption(LOG_KIT_OPT)) { - cocoon.setLogKit(line.getOptionValue(LOG_KIT_OPT)); - } - if (line.hasOption(LOGGER_OPT)) { - cocoon.setLogger(line.getOptionValue(LOGGER_OPT)); - } - if (line.hasOption(LOG_LEVEL_OPT)) { - cocoon.setLogLevel(line.getOptionValue(LOG_LEVEL_OPT)); - } - if (line.hasOption(AGENT_OPT)) { - cocoon.setAgentOptions(line.getOptionValue(AGENT_OPT)); - } - if (line.hasOption(ACCEPT_OPT)) { - cocoon.setAcceptOptions(line.getOptionValue(ACCEPT_OPT)); - } - if (line.hasOption(DEFAULT_FILENAME_OPT)) { - cocoon.setDefaultFilename(line.getOptionValue(DEFAULT_FILENAME_OPT)); - } - if (line.hasOption(BROKEN_LINK_FILE_OPT)) { - listener.setReportFile(line.getOptionValue(BROKEN_LINK_FILE_OPT)); - } - if (line.hasOption(FOLLOW_LINKS_OPT)) { - cocoon.setFollowLinks(BooleanUtils.toBoolean(line.getOptionValue(FOLLOW_LINKS_OPT))); - } - if (line.hasOption(CONFIRM_EXTENSIONS_OPT)) { - cocoon.setConfirmExtensions(BooleanUtils.toBoolean(line.getOptionValue(CONFIRM_EXTENSIONS_OPT, "yes"))); - } - if (line.hasOption(LOAD_CLASS_OPT)){ - cocoon.addLoadedClasses(Arrays.asList(line.getOptionValues(LOAD_CLASS_OPT))); - } - if (line.hasOption(URI_FILE_OPT)) { - cocoon.addTargets(BeanConfigurator.processURIFile(line.getOptionValue(URI_FILE_OPT)), destDir); - } - - cocoon.addTargets(line.getArgList(), destDir); - - listener.messageGenerated(CocoonBean.getProlog()); - - if (cocoon.getTargetCount() ==0 && cocoon.isPrecompileOnly()) { - listener.messageGenerated("Please, specify at least one starting URI."); - System.exit(1); - } - - cocoon.initialize(); - cocoon.process(); - cocoon.dispose(); - - listener.complete(); - - - int exitCode = (listener.isSuccessful() ? 0 : 1); - System.exit(exitCode); } private static String processXConf(CocoonBean cocoon, String filename, String destDir, String uriGroup) { @@ -350,7 +350,6 @@ CocoonBean.getProlog(), options, "Note: the context directory defaults to '"+ Constants.DEFAULT_CONTEXT_DIR + "'"); - System.exit(0); } /** @@ -358,6 +357,5 @@ */ private static void printVersion() { System.out.println(Constants.VERSION); - System.exit(0); } } Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/ProcessingException.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/ProcessingException.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/ProcessingException.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/ProcessingException.java Sun Jan 8 06:12:32 2006 @@ -30,7 +30,7 @@ * (Apache Software Foundation) * @version CVS $Id$ */ -public class ProcessingException extends LocatedException implements MultiLocatable { +public class ProcessingException extends LocatedException { /** * Construct a new ProcessingException instance. Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java Sun Jan 8 06:12:32 2006 @@ -190,8 +190,7 @@ * @version CVS $Id$ */ public abstract class AbstractValidatorAction - extends AbstractComplementaryConfigurableAction - implements Configurable { + extends AbstractComplementaryConfigurableAction { /** * Reads parameter values for all parameters that are contained in the active Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/EnvironmentStack.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/EnvironmentStack.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/EnvironmentStack.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/EnvironmentStack.java Sun Jan 8 06:12:32 2006 @@ -33,8 +33,7 @@ * @author Carsten Ziegeler * @version CVS $Id$ */ -final class EnvironmentStack extends ArrayStack - implements Cloneable { +final class EnvironmentStack extends ArrayStack { int offset; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Sun Jan 8 06:12:32 2006 @@ -16,7 +16,6 @@ package org.apache.cocoon.components.flow.javascript.fom; import org.apache.avalon.framework.activity.Initializable; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.service.ServiceManager; @@ -89,7 +88,7 @@ * @version CVS $Id$ */ public class FOM_JavaScriptInterpreter extends CompilingInterpreter - implements Configurable, Initializable { + implements Initializable { /** * A long value is stored under this key in each top level JavaScript Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java Sun Jan 8 06:12:32 2006 @@ -39,7 +39,7 @@ * @version CVS $Id$ */ public abstract class AbstractMetaModule extends AbstractInputModule - implements Composable, Disposable { + implements Composable { /** The component manager instance */ protected ComponentManager manager; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java Sun Jan 8 06:12:32 2006 @@ -19,10 +19,8 @@ import java.util.Iterator; import java.util.Map; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.thread.ThreadSafe; /** * Old name for {@link DefaultsModule}. @@ -34,8 +32,7 @@ /* Deprecated 2003-03-19. Suggest we keep this class for compat with 2.0.x * until at least v2.2 (JT) */ -public class DefaultsMetaModule extends DefaultsModule - implements InputModule, Configurable, ThreadSafe { +public class DefaultsMetaModule extends DefaultsModule { public void configure(Configuration config) throws ConfigurationException { super.configure( config ); Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java Sun Jan 8 06:12:32 2006 @@ -18,7 +18,6 @@ import java.util.Iterator; import java.util.Map; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.thread.ThreadSafe; @@ -84,8 +83,7 @@ * @author Vadim Gritsenko * @version $Id$ */ -public class JXPathMetaModule extends AbstractMetaModule - implements Configurable, ThreadSafe { +public class JXPathMetaModule extends AbstractMetaModule implements ThreadSafe { /** * Contains all globally registered extension classes and Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java Sun Jan 8 06:12:32 2006 @@ -15,7 +15,6 @@ */ package org.apache.cocoon.components.modules.input; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.thread.ThreadSafe; @@ -66,9 +65,7 @@ * @version $Id$ * */ -public class ProjectPathModule - extends AbstractInputModule - implements Configurable, ThreadSafe { +public class ProjectPathModule extends AbstractInputModule implements ThreadSafe { protected static final String PROJECT_PARAM_NAME = "uri-prefix"; protected static final String PROJECT_PARAM_DEFAULT = "/"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java Sun Jan 8 06:12:32 2006 @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.service.ServiceException; @@ -42,7 +41,7 @@ * @version $Id$ */ public class PropertiesFileModule extends AbstractJXPathModule -implements InputModule, Serviceable, Configurable, ThreadSafe { +implements Serviceable, ThreadSafe { private ServiceManager m_manager; private SourceResolver m_resolver; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java Sun Jan 8 06:12:32 2006 @@ -30,9 +30,9 @@ * "org.apache.cocoon.components.modules.output.OutputModule" * * @author Christian Haul - * @version CVS $Id: RequestAttributeMap.java,v 1.3 2004/03/05 13:02:49 bdelacretaz Exp $ + * @version CVS $Id$ */ -public class RequestAttributeMap extends AbstractOutputModule implements OutputModule { +public class RequestAttributeMap extends AbstractOutputModule { public final String PREFIX = "org.apache.cocoon.components.modules.output.OutputModule"; public final String TRANS_PREFIX = "org.apache.cocoon.components.modules.output.OutputModule.RequestAttributeMap.transient"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java Sun Jan 8 06:12:32 2006 @@ -37,7 +37,7 @@ * @author Christian Haul * @version CVS $Id$ */ -public class RequestAttributeOutputModule extends AbstractOutputModule implements OutputModule { +public class RequestAttributeOutputModule extends AbstractOutputModule { public static final String PREFIX = OutputModule.ROLE; public static final String TRANS_PREFIX = PREFIX + ".RequestAttributeOutputModule.transient"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java Sun Jan 8 06:12:32 2006 @@ -38,7 +38,7 @@ * @author Christian Haul * @version CVS $Id$ */ -public class SessionAttributeOutputModule extends AbstractOutputModule implements OutputModule { +public class SessionAttributeOutputModule extends AbstractOutputModule { public final String PREFIX = "org.apache.cocoon.components.modules.output.OutputModule"; public final String TRANS_PREFIX = "org.apache.cocoon.components.modules.output.OutputModule.SessionAttributeOutputModule.transient"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java Sun Jan 8 06:12:32 2006 @@ -17,7 +17,6 @@ import java.util.ArrayList; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.cocoon.xml.AbstractXMLProducer; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; @@ -28,10 +27,10 @@ * @author Stefano Mazzocchi * @author Carsten Ziegeler * @author Torsten Curdt - * @version CVS $Id: XMLByteStreamInterpreter.java,v 1.6 2004/03/05 13:02:50 bdelacretaz Exp $ + * @version CVS $Id$ */ -public final class XMLByteStreamInterpreter extends AbstractXMLProducer implements XMLDeserializer, Recyclable { +public final class XMLByteStreamInterpreter extends AbstractXMLProducer implements XMLDeserializer { private static final int START_DOCUMENT = 0; private static final int END_DOCUMENT = 1; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java Sun Jan 8 06:12:32 2006 @@ -30,8 +30,7 @@ * @author Sylvain Wallez * @version $Id$ */ -public class MultiSourceValidity extends AbstractAggregatedValidity - implements SourceValidity { +public class MultiSourceValidity extends AbstractAggregatedValidity { /**

When validity expiration is performed.

*/ private long expiry; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java Sun Jan 8 06:12:32 2006 @@ -16,9 +16,7 @@ package org.apache.cocoon.components.store.impl; import org.apache.avalon.framework.activity.Disposable; -import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.parameters.ParameterException; -import org.apache.avalon.framework.parameters.Parameterizable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; @@ -35,7 +33,7 @@ * @version $Id$ */ public class CocoonStoreJanitor extends StoreJanitorImpl - implements Parameterizable, Serviceable, Disposable, Component { + implements Serviceable, Disposable { //~ Instance fields -------------------------------------------------------- Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java Sun Jan 8 06:12:32 2006 @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.thread.ThreadSafe; @@ -33,7 +32,7 @@ */ public class CategoryNodeBuilder extends AbstractParentProcessingNodeBuilder - implements Configurable, ThreadSafe { + implements ThreadSafe { // Prefix used for registering as a TreeBuilder attribute private static String PREFIX = CategoryNodeBuilder.class.getName() + "/"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java Sun Jan 8 06:12:32 2006 @@ -15,7 +15,6 @@ */ package org.apache.cocoon.components.treeprocessor; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; @@ -23,10 +22,10 @@ * Builds a generic named container node. * * @author Sylvain Wallez - * @version CVS $Id: NamedContainerNodeBuilder.java,v 1.2 2004/03/05 13:02:51 bdelacretaz Exp $ + * @version CVS $Id$ */ -public class NamedContainerNodeBuilder extends ContainerNodeBuilder implements Configurable { +public class NamedContainerNodeBuilder extends ContainerNodeBuilder { protected String nameAttr; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelinesNodeBuilder.java Sun Jan 8 06:12:32 2006 @@ -20,7 +20,6 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.cocoon.components.treeprocessor.ContainerNodeBuilder; import org.apache.cocoon.components.treeprocessor.ProcessingNode; import org.apache.cocoon.components.treeprocessor.ProcessingNodeBuilder; @@ -34,7 +33,7 @@ * @author Carsten Ziegeler * @version $Id$ */ -public class PipelinesNodeBuilder extends ContainerNodeBuilder implements ThreadSafe { +public class PipelinesNodeBuilder extends ContainerNodeBuilder { public ProcessingNode buildNode(Configuration config) throws Exception { Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java Sun Jan 8 06:12:32 2006 @@ -26,10 +26,10 @@ * Builds a <map:view> * * @author Sylvain Wallez - * @version CVS $Id: ViewNodeBuilder.java,v 1.2 2004/03/05 13:02:52 bdelacretaz Exp $ + * @version CVS $Id$ */ -public class ViewNodeBuilder extends NamedContainerNodeBuilder implements ThreadSafe { +public class ViewNodeBuilder extends NamedContainerNodeBuilder { public ProcessingNode buildNode(Configuration config) throws Exception { Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java Sun Jan 8 06:12:32 2006 @@ -43,9 +43,7 @@ * @author Carsten Ziegeler * @version CVS $Id$ */ -public class EnvironmentWrapper - extends AbstractEnvironment - implements Environment { +public class EnvironmentWrapper extends AbstractEnvironment { /** The wrapped environment */ protected Environment environment; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/LinkStatusGenerator.java Sun Jan 8 06:12:32 2006 @@ -15,7 +15,6 @@ */ package org.apache.cocoon.generation; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; @@ -58,7 +57,7 @@ * @version $Id$ */ public class LinkStatusGenerator extends ServiceableGenerator - implements Recyclable, Configurable { + implements Configurable { /** The URI of the namespace of this generator. */ protected static final String URI = Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java Sun Jan 8 06:12:32 2006 @@ -21,7 +21,6 @@ import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.AbstractLogEnabled; -import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; @@ -51,7 +50,7 @@ */ public class XMLResourceBundleFactory extends AbstractLogEnabled implements BundleFactory, Serviceable, Configurable, - Disposable, ThreadSafe, LogEnabled { + Disposable, ThreadSafe { /** * Root directory to all bundle names Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractRegexpSelector.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractRegexpSelector.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractRegexpSelector.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractRegexpSelector.java Sun Jan 8 06:12:32 2006 @@ -21,7 +21,6 @@ import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; -import org.apache.avalon.framework.thread.ThreadSafe; import org.apache.regexp.RE; import org.apache.regexp.RECompiler; import org.apache.regexp.REProgram; @@ -71,7 +70,7 @@ * @version CVS $Id: AbstractRegexpSelector.java 30941 2004-07-29 19:56:58Z vgritsenko $ */ public abstract class AbstractRegexpSelector extends AbstractSwitchSelector -implements Configurable, ThreadSafe { +implements Configurable { /**

A {@link Map} of regular expression programs by name.

*/ protected Map patterns = new HashMap(); Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/RequestParameterSelector.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/RequestParameterSelector.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/RequestParameterSelector.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/RequestParameterSelector.java Sun Jan 8 06:12:32 2006 @@ -19,7 +19,6 @@ import org.apache.avalon.framework.configuration.Configuration; 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.environment.ObjectModelHelper; import java.util.Map; @@ -37,10 +36,10 @@ * @author Sylvain Wallez * @author Vadim Gritsenko * @author Marcus Crafter - * @version CVS $Id: RequestParameterSelector.java,v 1.3 2004/03/05 13:02:57 bdelacretaz Exp $ + * @version CVS $Id$ */ public class RequestParameterSelector extends AbstractSwitchSelector - implements Configurable, ThreadSafe { + implements Configurable { protected String defaultName; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/SimpleSelector.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/SimpleSelector.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/SimpleSelector.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/SimpleSelector.java Sun Jan 8 06:12:32 2006 @@ -18,7 +18,6 @@ import java.util.Map; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.framework.thread.ThreadSafe; /** * A very simple selector that operates on string literals, useful especially @@ -44,10 +43,10 @@ * * * @author Christian Haul - * @version CVS $Id: SimpleSelector.java,v 1.3 2004/03/05 13:02:57 bdelacretaz Exp $ + * @version CVS $Id$ * @since 2.1 */ -public class SimpleSelector extends AbstractSwitchSelector implements ThreadSafe { +public class SimpleSelector extends AbstractSwitchSelector { public Object getSelectorContext(Map objectModel, Parameters parameters) { return parameters.getParameter("value", ""); Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/XPathExceptionSelector.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/XPathExceptionSelector.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/XPathExceptionSelector.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/XPathExceptionSelector.java Sun Jan 8 06:12:32 2006 @@ -19,7 +19,6 @@ import java.util.Iterator; import java.util.Map; -import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; @@ -51,10 +50,9 @@ * @author Jürgen Seitz * @author Björn Lütkemeier * @since 2.1 - * @version CVS $Id: XPathExceptionSelector.java,v 1.8 2004/03/05 13:02:57 bdelacretaz Exp $ + * @version CVS $Id$ */ -public class XPathExceptionSelector extends ExceptionSelector - implements Configurable { +public class XPathExceptionSelector extends ExceptionSelector { private Map exception2XPath = new HashMap(); Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java Sun Jan 8 06:12:32 2006 @@ -20,8 +20,6 @@ import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.avalon.excalibur.pool.Recyclable; - import org.apache.cocoon.ProcessingException; import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.xml.dom.DOMBuilder; @@ -48,7 +46,7 @@ * @version CVS $Id$ */ public abstract class AbstractDOMTransformer extends AbstractTransformer - implements Transformer, DOMBuilder.Listener, Composable, Disposable, Recyclable { + implements DOMBuilder.Listener, Composable, Disposable { /** * The SAX entity resolver Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java Sun Jan 8 06:12:32 2006 @@ -15,7 +15,6 @@ */ package org.apache.cocoon.transformation; -import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; @@ -107,7 +106,7 @@ * @version $Id$ */ public abstract class AbstractSAXTransformer extends AbstractTransformer - implements Serviceable, Configurable, Recyclable, Disposable { + implements Serviceable, Configurable, Disposable { /** * Empty immutable attributes (for performance). Use them Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java Sun Jan 8 06:12:32 2006 @@ -15,7 +15,6 @@ */ package org.apache.cocoon.transformation; -import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; @@ -126,7 +125,7 @@ * @version $Id$ */ public class CIncludeTransformer extends AbstractSAXTransformer - implements Disposable, CacheableProcessingComponent { + implements CacheableProcessingComponent { public static final String CINCLUDE_NAMESPACE_URI = "http://apache.org/cocoon/include/1.0"; public static final String CINCLUDE_INCLUDE_ELEMENT = "include"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java Sun Jan 8 06:12:32 2006 @@ -30,8 +30,6 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; -import org.apache.avalon.excalibur.pool.Recyclable; - import org.apache.cocoon.ProcessingException; import org.apache.cocoon.caching.CacheableProcessingComponent; import org.apache.cocoon.components.sax.XMLSerializer; @@ -70,7 +68,7 @@ * @version CVS $Id$ */ public class FragmentExtractorTransformer extends AbstractTransformer - implements CacheableProcessingComponent, Configurable, Serviceable, Disposable, Recyclable { + implements CacheableProcessingComponent, Configurable, Serviceable, Disposable { public static final String FE_URI = "http://apache.org/cocoon/fragmentextractor/2.0"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/IncludeTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/IncludeTransformer.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/IncludeTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/IncludeTransformer.java Sun Jan 8 06:12:32 2006 @@ -171,7 +171,7 @@ */ public class IncludeTransformer extends AbstractTransformer implements Serviceable, Configurable, - Transformer, CacheableProcessingComponent { + CacheableProcessingComponent { /**

The namespace URI of the elements recognized by this transformer.

*/ private static final String NS_URI = "http://apache.org/cocoon/include/1.0"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java Sun Jan 8 06:12:32 2006 @@ -27,8 +27,6 @@ import org.apache.avalon.framework.service.ServiceSelector; import org.apache.avalon.framework.service.Serviceable; -import org.apache.avalon.excalibur.pool.Recyclable; - import org.apache.cocoon.ProcessingException; import org.apache.cocoon.components.modules.output.OutputModule; import org.apache.cocoon.environment.SourceResolver; @@ -58,7 +56,7 @@ * @version CVS $Id$ */ public class SimpleFormInstanceExtractionTransformer extends AbstractExtractionTransformer - implements Configurable, Serviceable, Recyclable { + implements Configurable, Serviceable { protected static class ElementData { public String uri = null; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java Sun Jan 8 06:12:32 2006 @@ -21,8 +21,6 @@ import org.apache.avalon.framework.service.ServiceSelector; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.avalon.excalibur.pool.Recyclable; - import org.apache.cocoon.ProcessingException; import org.apache.cocoon.acting.ValidatorActionResult; import org.apache.cocoon.transformation.helpers.FormValidatorHelper; @@ -147,7 +145,7 @@ * @author Christian Haul * @version $Id$ */ -public class SimpleFormTransformer extends AbstractSAXTransformer implements Recyclable { +public class SimpleFormTransformer extends AbstractSAXTransformer { /** strip numbers from repeated element name attributes */ private boolean stripNumber = true; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/transformation/SourceWritingTransformer.java Sun Jan 8 06:12:32 2006 @@ -19,7 +19,6 @@ import java.io.OutputStream; import java.util.Map; -import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.parameters.Parameters; @@ -232,8 +231,7 @@ * @author Gianugo Rabellino * @version $Id$ */ -public class SourceWritingTransformer extends AbstractSAXTransformer - implements Disposable { +public class SourceWritingTransformer extends AbstractSAXTransformer { public static final String SWT_URI = "http://apache.org/cocoon/source/1.0"; public static final String DEFAULT_SERIALIZER = "xml"; Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java?rev=367030&r1=367029&r2=367030&view=diff ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java Sun Jan 8 06:12:32 2006 @@ -15,7 +15,6 @@ */ package org.apache.cocoon.xml; -import org.apache.avalon.framework.logger.LogEnabled; import org.apache.avalon.framework.logger.Logger; import org.xml.sax.Attributes; @@ -38,9 +37,9 @@ * * @author Pierpaolo Fumagalli * (Apache Software Foundation) - * @version CVS $Id: DocumentHandlerWrapper.java,v 1.2 2004/03/05 13:03:01 bdelacretaz Exp $ + * @version CVS $Id$ */ -public class DocumentHandlerWrapper extends AbstractXMLConsumer implements LogEnabled /*, Recyclable*/ { +public class DocumentHandlerWrapper extends AbstractXMLConsumer { protected Logger log;