cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r367031 - in /cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon: ./ acting/ components/flow/javascript/fom/ components/modules/input/ components/modules/output/ components/source/impl/ components/store/impl/ components/treeprocessor/...
Date Sun, 08 Jan 2006 14:13:41 GMT
Author: antonio
Date: Sun Jan  8 06:13:18 2006
New Revision: 367031

URL: http://svn.apache.org/viewcvs?rev=367031&view=rev
Log:
Remove redundancy, superclass already implements this interfaces.

Modified:
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/Main.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/ProcessingException.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNodeBuilder.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/AbstractRegexpSelector.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/RequestParameterSelector.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/SimpleSelector.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/XPathExceptionSelector.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/Main.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/Main.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/Main.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/Main.java Sun Jan  8 06:13:18
2006
@@ -217,101 +217,101 @@
              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(PRECOMPILE_ONLY_OPT)) {
-            cocoon.setPrecompileOnly(true);
-        }
-
-        if (line.hasOption(WORK_DIR_OPT)) {
-            String workDir = line.getOptionValue(WORK_DIR_OPT);
-            if (workDir.equals("")) {
-                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.equals("")) {
-                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(PRECOMPILE_ONLY_OPT)) {
+                cocoon.setPrecompileOnly(true);
+            }
+    
+            if (line.hasOption(WORK_DIR_OPT)) {
+                String workDir = line.getOptionValue(WORK_DIR_OPT);
+                if (workDir.equals("")) {
+                    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.equals("")) {
+                    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) {
@@ -336,7 +336,6 @@
                             CocoonBean.getProlog(),
                             options,
                             "Note: the context directory defaults to '"+ Constants.DEFAULT_CONTEXT_DIR
+ "'");
-        System.exit(0);
     }
 
     /**
@@ -344,6 +343,5 @@
      */
     private static void printVersion() {
         System.out.println(Constants.VERSION);
-        System.exit(0);
     }
 }

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/ProcessingException.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/ProcessingException.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/ProcessingException.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/ProcessingException.java Sun
Jan  8 06:13:18 2006
@@ -28,7 +28,7 @@
  *
  * @version $Id$
  */
-public class ProcessingException extends LocatedException implements MultiLocatable {
+public class ProcessingException extends LocatedException {
     
     /**
      * Construct a new <code>ProcessingException</code> instance.

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/acting/AbstractValidatorAction.java
Sun Jan  8 06:13:18 2006
@@ -187,8 +187,7 @@
  * @version $Id$
  */
 public abstract class AbstractValidatorAction
-    extends AbstractComplementaryConfigurableAction
-    implements Configurable {
+    extends AbstractComplementaryConfigurableAction {
 
     /**
      * This is the name of the request attribute containing the result

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Sun Jan  8 06:13:18 2006
@@ -28,7 +28,6 @@
 import java.util.Map;
 
 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;
@@ -76,7 +75,7 @@
  * @version $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/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
Sun Jan  8 06:13:18 2006
@@ -19,7 +19,6 @@
 import java.util.Iterator;
 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.service.ServiceException;
@@ -37,7 +36,7 @@
  * @version $Id$
  */
 public abstract class AbstractMetaModule extends AbstractInputModule
-    implements Serviceable, Disposable {
+    implements Serviceable {
 
     /** The service manager instance */
     protected ServiceManager manager;

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/JXPathMetaModule.java
Sun Jan  8 06:13:18 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;
@@ -81,8 +80,7 @@
  *
  * @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/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/ProjectPathModule.java
Sun Jan  8 06:13:18 2006
@@ -68,9 +68,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/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java
Sun Jan  8 06:13:18 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;
@@ -41,7 +40,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/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeMap.java
Sun Jan  8 06:13:18 2006
@@ -32,7 +32,7 @@
  *
  * @version $Id$
  */
-public class RequestAttributeMap extends AbstractOutputModule implements OutputModule, ThreadSafe
{
+public class RequestAttributeMap extends AbstractOutputModule implements ThreadSafe {
     
     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/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/RequestAttributeOutputModule.java
Sun Jan  8 06:13:18 2006
@@ -37,7 +37,7 @@
  *
  * @version $Id$
  */
-public class RequestAttributeOutputModule extends AbstractOutputModule implements OutputModule,
ThreadSafe {
+public class RequestAttributeOutputModule extends AbstractOutputModule implements ThreadSafe
{
 
     public static final String PREFIX = OutputModule.ROLE;
     public static final String TRANS_PREFIX = PREFIX + ".RequestAttributeOutputModule.transient";

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
Sun Jan  8 06:13:18 2006
@@ -38,7 +38,7 @@
  *
  * @version $Id$
  */
-public class SessionAttributeOutputModule extends AbstractOutputModule implements OutputModule,
ThreadSafe {
+public class SessionAttributeOutputModule extends AbstractOutputModule implements ThreadSafe
{
     
     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/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java
Sun Jan  8 06:13:18 2006
@@ -29,8 +29,7 @@
  *
  * @version $Id$
  */
-public class MultiSourceValidity extends AbstractAggregatedValidity
-                                 implements SourceValidity {
+public class MultiSourceValidity extends AbstractAggregatedValidity {
 
     /** <p>When validity expiration is performed.</p> */
     private long expiry;

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/store/impl/CocoonStoreJanitor.java
Sun Jan  8 06:13:18 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;
@@ -34,7 +32,7 @@
  * @version $Id$
  */
 public class CocoonStoreJanitor extends StoreJanitorImpl
-                                implements Parameterizable, Serviceable, Disposable, Component
{
+                                implements Serviceable, Disposable {
 
     //~ Instance fields --------------------------------------------------------
 

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/CategoryNodeBuilder.java
Sun Jan  8 06:13:18 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;
@@ -31,7 +30,7 @@
  * @version $Id$
  */
 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/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NamedContainerNodeBuilder.java
Sun Jan  8 06:13:18 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;
 
@@ -24,7 +23,7 @@
  *
  * @version $Id$
  */
-public class NamedContainerNodeBuilder extends ContainerNodeBuilder implements Configurable
{
+public class NamedContainerNodeBuilder extends ContainerNodeBuilder {
 
     protected String nameAttr;
 

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNodeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNodeBuilder.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNodeBuilder.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNodeBuilder.java
Sun Jan  8 06:13:18 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.pipeline.ProcessingPipeline;
 import org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
@@ -31,8 +30,7 @@
  *
  * @version $Id$
  */
-public class PipelineNodeBuilder extends AbstractParentProcessingNodeBuilder
-                                 implements ThreadSafe {
+public class PipelineNodeBuilder extends AbstractParentProcessingNodeBuilder {
 
     /** This builder can have parameters -- return <code>true</code> */
     protected boolean hasParameters() {

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ViewNodeBuilder.java
Sun Jan  8 06:13:18 2006
@@ -17,7 +17,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.NamedContainerNodeBuilder;
 import org.apache.cocoon.components.treeprocessor.NamedProcessingNode;
 import org.apache.cocoon.components.treeprocessor.ProcessingNode;
@@ -27,7 +26,7 @@
  *
  * @version $Id$
  */
-public class ViewNodeBuilder extends NamedContainerNodeBuilder implements ThreadSafe {
+public class ViewNodeBuilder extends NamedContainerNodeBuilder {
 
     public ProcessingNode buildNode(Configuration config) throws Exception {
 

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java
Sun Jan  8 06:13:18 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;
@@ -55,7 +54,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/trunk/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Sun Jan  8 06:13:18 2006
@@ -20,7 +20,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;
@@ -47,7 +46,7 @@
  */
 public class XMLResourceBundleFactory extends AbstractLogEnabled
                                       implements BundleFactory, Serviceable, Configurable,
-                                                 Disposable, ThreadSafe, LogEnabled {
+                                                 Disposable, ThreadSafe {
 
     /**
      * Root directory to all bundle names

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/AbstractRegexpSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/AbstractRegexpSelector.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/AbstractRegexpSelector.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/AbstractRegexpSelector.java
Sun Jan  8 06:13:18 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;
@@ -70,7 +69,7 @@
  * @version $Id$
  */
 public abstract class AbstractRegexpSelector extends AbstractSwitchSelector
-implements Configurable, ThreadSafe {
+implements Configurable {
 
     /** <p>A {@link Map} of regular expression programs by name.</p> */
     protected Map patterns = new HashMap();

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/RequestParameterSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/RequestParameterSelector.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/RequestParameterSelector.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/RequestParameterSelector.java
Sun Jan  8 06:13:18 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;
@@ -36,7 +35,7 @@
  * @version $Id$
  */
 public class RequestParameterSelector extends AbstractSwitchSelector
-  implements Configurable, ThreadSafe {
+  implements Configurable {
 
     protected String defaultName;
 

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/SimpleSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/SimpleSelector.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/SimpleSelector.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/SimpleSelector.java
Sun Jan  8 06:13:18 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 
@@ -46,7 +45,7 @@
  * @version $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/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/XPathExceptionSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/XPathExceptionSelector.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/XPathExceptionSelector.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/selection/XPathExceptionSelector.java
Sun Jan  8 06:13:18 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,8 +50,7 @@
  * @since 2.1
  * @version $Id$
  */
-public class XPathExceptionSelector extends ExceptionSelector
-  implements Configurable {
+public class XPathExceptionSelector extends ExceptionSelector {
 
     private Map exception2XPath = new HashMap();
 

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
Sun Jan  8 06:13:18 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;
@@ -106,7 +105,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/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Sun Jan  8 06:13:18 2006
@@ -19,7 +19,6 @@
 import java.io.Serializable;
 import java.util.Map;
 
-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;
@@ -122,7 +121,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/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Sun Jan  8 06:13:18 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.XMLByteStreamCompiler;
@@ -69,7 +67,7 @@
  * @version $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/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/IncludeTransformer.java
Sun Jan  8 06:13:18 2006
@@ -169,7 +169,7 @@
  */
 public class IncludeTransformer extends AbstractTransformer
                                 implements Serviceable, Configurable,
-                                           Transformer, CacheableProcessingComponent {
+                                           CacheableProcessingComponent {
 
     /** <p>The namespace URI of the elements recognized by this transformer.</p>
*/
     private static final String NS_URI = "http://apache.org/cocoon/include/1.0";

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.java
Sun Jan  8 06:13:18 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;
@@ -57,7 +55,7 @@
  * @version $Id$
  */
 public class SimpleFormInstanceExtractionTransformer extends AbstractExtractionTransformer

-    implements Configurable, Serviceable, Recyclable {
+    implements Configurable, Serviceable {
 
     protected class ElementData {
         public String uri = null;
@@ -245,5 +243,4 @@
         }
         this.instanceName = null;
     }
-
 }

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
Sun Jan  8 06:13:18 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;
@@ -146,7 +144,7 @@
  *
  * @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/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
Sun Jan  8 06:13:18 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;
@@ -229,8 +228,7 @@
  *
  * @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/trunk/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java?rev=367031&r1=367030&r2=367031&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
(original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/xml/DocumentHandlerWrapper.java
Sun Jan  8 06:13:18 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,7 +37,7 @@
  *
  * @version $Id$
  */
-public class DocumentHandlerWrapper extends AbstractXMLConsumer implements LogEnabled /*,
Recyclable*/ {
+public class DocumentHandlerWrapper extends AbstractXMLConsumer {
 
     protected Logger log;
 



Mime
View raw message