cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: rev 55383 - in cocoon/trunk/src: blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context blocks/axis/java/org/apache/cocoon/webservices/instrument blocks/databases/java/org/apache/cocoon/components/modules/database blocks/deli/java/org/apache/cocoon/components/deli blocks/eventcache/java/org/apache/cocoon/caching blocks/forms/java/org/apache/cocoon/forms blocks/forms/java/org/apache/cocoon/forms/expression blocks/lucene/java/org/apache/cocoon/components/search blocks/mail/java/org/apache/cocoon/mail blocks/naming/java/org/apache/cocoon/components/naming blocks/ojb/java/org/apache/cocoon/ojb/jdo/components blocks/poi/java/org/apache/cocoon/components/elementprocessor blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl blocks/portal/java/org/apache/cocoon/components/persistence blocks/portal/java/org/apache/cocoon/components/variables blocks/portal/java/org/apache/cocoon/portal blocks/portal/java/org/apache/cocoon/portal/coplet/adapter blocks/portal/java/org/apache/cocoon/portal/coplet/impl blocks/portal/java/org/apache/cocoon/portal/coplets/basket blocks/portal/java/org/apache/cocoon/portal/event blocks/portal/java/org/apache/cocoon/portal/event/aspect blocks/portal/java/org/apache/cocoon/portal/layout/impl blocks/session-fw/java/org/apache/cocoon/webapps/session/components blocks/taglib/java/org/apache/cocoon/jxpath blocks/taglib/java/org/apache/cocoon/transformation blocks/woody/java/org/apache/cocoon/woody blocks/woody/java/org/apache/cocoon/woody/expression java/org/apache/cocoon/acting java/org/apache/cocoon/caching java/org/apache/cocoon/components/classloader java/org/apache/cocoon/components/crawler java/org/apache/cocoon/components/flow java/org/apache/cocoon/components/modules/input java/org/apache/cocoon/components/notification java/org/apache/cocoon/components/pipeline java/org/apache/cocoon/generation java/org/apache/cocoon/i18n java/org/apache/cocoon/transformation/helpers test/org/apache/cocoon
Date Sat, 23 Oct 2004 15:10:47 GMT
Author: cziegeler
Date: Sat Oct 23 08:10:46 2004
New Revision: 55383

Modified:
   cocoon/trunk/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
   cocoon/trunk/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java
   cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationService.java
   cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/modules/database/AutoIncrementModule.java
   cocoon/trunk/src/blocks/deli/java/org/apache/cocoon/components/deli/Deli.java
   cocoon/trunk/src/blocks/eventcache/java/org/apache/cocoon/caching/EventRegistry.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/DefaultCacheManager.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/DefaultFormManager.java
   cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/expression/DefaultExpressionManager.java
   cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonIndexer.java
   cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonSearcher.java
   cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneXMLIndexer.java
   cocoon/trunk/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java
   cocoon/trunk/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java
   cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMF.java
   cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/ElementProcessor.java
   cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/ElementProcessorFactory.java
   cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/AbstractElementProcessorFactory.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/EventConverter.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/EventManager.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/EventAspect.java
   cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
   cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java
   cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java
   cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java
   cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java
   cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java
   cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java
   cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java
   cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/DefaultCacheManager.java
   cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/DefaultFormManager.java
   cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/expression/DefaultExpressionManager.java
   cocoon/trunk/src/java/org/apache/cocoon/acting/Action.java
   cocoon/trunk/src/java/org/apache/cocoon/caching/Cache.java
   cocoon/trunk/src/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java
   cocoon/trunk/src/java/org/apache/cocoon/components/crawler/CocoonCrawler.java
   cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
   cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
   cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/InputModule.java
   cocoon/trunk/src/java/org/apache/cocoon/components/notification/DefaultNotifyingBuilder.java
   cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
   cocoon/trunk/src/java/org/apache/cocoon/generation/GeneratorFactory.java
   cocoon/trunk/src/java/org/apache/cocoon/i18n/Bundle.java
   cocoon/trunk/src/java/org/apache/cocoon/i18n/BundleFactory.java
   cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java
   cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
Log:
Remove usage of deprecated Component, Composable, ComponentSelector interfaces

Modified: cocoon/trunk/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
==============================================================================
--- cocoon/trunk/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java	(original)
+++ cocoon/trunk/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java	Sat Oct 23 08:10:46 2004
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.avalon.framework.context.Context;
@@ -74,8 +73,7 @@
                    Serviceable,
                    Disposable,
                    ThreadSafe,
-                   Contextualizable,
-                   Component {
+                   Contextualizable {
 
     /** The name of the session attribute storing the user status */
     public final static String SESSION_ATTRIBUTE_USER_STATUS = DefaultAuthenticationManager.class.getName() + "/UserStatus";

Modified: cocoon/trunk/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java
==============================================================================
--- cocoon/trunk/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java	(original)
+++ cocoon/trunk/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.webapps.authentication.context;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -34,11 +33,11 @@
  *  Context provider for the authentication context
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: AuthenticationContextProvider.java,v 1.8 2004/03/05 13:01:41 bdelacretaz Exp $
+ * @version CVS $Id$
 */
 public final class AuthenticationContextProvider
 extends AbstractLogEnabled
-implements SessionContextProvider, ThreadSafe, Component, Serviceable {
+implements SessionContextProvider, ThreadSafe, Serviceable {
 
     protected ServiceManager manager;
     

Modified: cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationService.java
==============================================================================
--- cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationService.java	(original)
+++ cocoon/trunk/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationService.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.webservices.instrument;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.excalibur.instrument.InstrumentManageable;
 
 /**
@@ -25,7 +24,7 @@
  * @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
  * @version CVS $Id$
  */
-public interface InstrumentationService extends InstrumentManageable, Component {
+public interface InstrumentationService extends InstrumentManageable {
 
     /**
      * Component ROLE name

Modified: cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/modules/database/AutoIncrementModule.java
==============================================================================
--- cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/modules/database/AutoIncrementModule.java	(original)
+++ cocoon/trunk/src/blocks/databases/java/org/apache/cocoon/components/modules/database/AutoIncrementModule.java	Sat Oct 23 08:10:46 2004
@@ -20,7 +20,6 @@
 import java.sql.Statement;
 import java.sql.SQLException;
 import java.util.Map;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
@@ -29,9 +28,9 @@
  * attribute columns.
  *
  * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: AutoIncrementModule.java,v 1.4 2004/03/05 13:01:54 bdelacretaz Exp $
+ * @version CVS $Id$
  * */
-public interface AutoIncrementModule extends Component {
+public interface AutoIncrementModule {
 
     String ROLE = AutoIncrementModule.class.getName();
 

Modified: cocoon/trunk/src/blocks/deli/java/org/apache/cocoon/components/deli/Deli.java
==============================================================================
--- cocoon/trunk/src/blocks/deli/java/org/apache/cocoon/components/deli/Deli.java	(original)
+++ cocoon/trunk/src/blocks/deli/java/org/apache/cocoon/components/deli/Deli.java	Sat Oct 23 08:10:46 2004
@@ -17,7 +17,6 @@
 
 import com.hp.hpl.deli.Profile;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.environment.Request;
 import org.w3c.dom.Document;
 
@@ -29,10 +28,10 @@
  * library.
  *
  * @author <a href="mailto:marbut@hplb.hpl.hp.com">Mark H. Butler</a>
- * @version CVS $Id: Deli.java,v 1.3 2004/03/05 13:01:55 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 
-public interface Deli extends Component {
+public interface Deli {
 
     String ROLE = Deli.class.getName();
 

Modified: cocoon/trunk/src/blocks/eventcache/java/org/apache/cocoon/caching/EventRegistry.java
==============================================================================
--- cocoon/trunk/src/blocks/eventcache/java/org/apache/cocoon/caching/EventRegistry.java	(original)
+++ cocoon/trunk/src/blocks/eventcache/java/org/apache/cocoon/caching/EventRegistry.java	Sat Oct 23 08:10:46 2004
@@ -17,7 +17,6 @@
 
 import java.io.Serializable;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.caching.validity.Event;
 
 /**
@@ -36,9 +35,9 @@
  *  
  * @since 2.1
  * @author <a href="mailto:ghoward@apache.org">Geoff Howard</a>
- * @version CVS $Id: EventRegistry.java,v 1.6 2004/03/05 13:01:56 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface EventRegistry extends Component {
+public interface EventRegistry {
     
     /**
      * The Avalon ROLE for this component

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/DefaultCacheManager.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/DefaultCacheManager.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/DefaultCacheManager.java	Sat Oct 23 08:10:46 2004
@@ -18,7 +18,6 @@
 import java.io.IOException;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -34,11 +33,11 @@
 /**
  * Component implementing the {@link CacheManager} role.
  * 
- * @version $Id: DefaultCacheManager.java,v 1.1 2004/03/09 10:34:12 reinhard Exp $
+ * @version $Id$
  */
 public class DefaultCacheManager 
   extends AbstractLogEnabled 
-  implements CacheManager, ThreadSafe, Serviceable, Disposable, Configurable, Component {
+  implements CacheManager, ThreadSafe, Serviceable, Disposable, Configurable {
       
     protected ServiceManager manager;
     protected Configuration configuration;

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/DefaultFormManager.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/DefaultFormManager.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/DefaultFormManager.java	Sat Oct 23 08:10:46 2004
@@ -18,7 +18,6 @@
 import org.apache.avalon.framework.CascadingException;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -49,7 +48,7 @@
  */
 public class DefaultFormManager
   extends AbstractLogEnabled
-  implements FormManager, Contextualizable, ThreadSafe, Serviceable, Disposable, Configurable, Component, Initializable {
+  implements FormManager, Contextualizable, ThreadSafe, Serviceable, Disposable, Configurable, Initializable {
 
     protected static final String PREFIX = "CocoonForm:";
     protected ServiceManager manager;

Modified: cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/expression/DefaultExpressionManager.java
==============================================================================
--- cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/expression/DefaultExpressionManager.java	(original)
+++ cocoon/trunk/src/blocks/forms/java/org/apache/cocoon/forms/expression/DefaultExpressionManager.java	Sat Oct 23 08:10:46 2004
@@ -16,7 +16,6 @@
 
 package org.apache.cocoon.forms.expression;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -36,10 +35,10 @@
  *   &lt;function name="MyFunction" class="net.foo.MyFunction"/&gt;
  * </pre>
  * 
- * @version CVS $Id: DefaultExpressionManager.java,v 1.1 2004/03/09 10:34:08 reinhard Exp $
+ * @version CVS $Id$
  */
 public class DefaultExpressionManager
-        implements ExpressionManager, Component, Configurable, ThreadSafe {
+        implements ExpressionManager, Configurable, ThreadSafe {
     
     private DefaultFunctionFactory factory;
     

Modified: cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonIndexer.java
==============================================================================
--- cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonIndexer.java	(original)
+++ cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonIndexer.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.components.search;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.ProcessingException;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.store.Directory;
@@ -26,16 +25,11 @@
  * The avalon behavioural component interface of an indexer.
  *
  * @author <a href="mailto:berni_huber@a1.net">Bernhard Huber</a>
- * @version CVS $Id: LuceneCocoonIndexer.java,v 1.3 2004/03/05 13:01:59 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface LuceneCocoonIndexer extends Component
-{
-    /**
-     *Description of the Field
-     *
-     * @since
-     */
-    String ROLE = "org.apache.cocoon.components.search.LuceneCocoonIndexer";
+public interface LuceneCocoonIndexer {
+    
+    String ROLE = LuceneCocoonIndexer.class.getName();
 
 
     /**

Modified: cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonSearcher.java
==============================================================================
--- cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonSearcher.java	(original)
+++ cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneCocoonSearcher.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.components.search;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.ProcessingException;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.search.Hits;
@@ -32,10 +31,9 @@
  * </p>
  *
  * @author <a href="mailto:berni_huber@a1.net">Bernhard Huber</a>
- * @version CVS $Id: LuceneCocoonSearcher.java,v 1.4 2004/06/21 09:43:22 jeremy Exp $
+ * @version CVS $Id$
  */
-public interface LuceneCocoonSearcher extends Component
-{
+public interface LuceneCocoonSearcher {
     /**
      * The ROLE name of this avalon component.
      * <p>
@@ -45,7 +43,7 @@
      *
      * @since
      */
-    String ROLE = "org.apache.cocoon.components.search.LuceneCocoonSearcher";
+    String ROLE = LuceneCocoonSearcher.class.getName();
 
 
     /**

Modified: cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneXMLIndexer.java
==============================================================================
--- cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneXMLIndexer.java	(original)
+++ cocoon/trunk/src/blocks/lucene/java/org/apache/cocoon/components/search/LuceneXMLIndexer.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.components.search;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.ProcessingException;
 
 import java.net.URL;
@@ -39,10 +38,9 @@
  * </p>
  *
  * @author <a href="mailto:berni_huber@a1.net">Bernhard Huber</a>
- * @version CVS $Id: LuceneXMLIndexer.java,v 1.3 2004/03/05 13:01:59 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface LuceneXMLIndexer extends Component
-{
+public interface LuceneXMLIndexer {
 
     /**
      * The ROLE name of this avalon component.
@@ -53,7 +51,7 @@
      *
      * @since
      */
-    String ROLE = "org.apache.cocoon.components.search.LuceneXMLIndexer";
+    String ROLE = LuceneXMLIndexer.class.getName();
 
     /**
      * A Lucene document field name, containing xml content text of all xml elements.

Modified: cocoon/trunk/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java
==============================================================================
--- cocoon/trunk/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java	(original)
+++ cocoon/trunk/src/blocks/mail/java/org/apache/cocoon/mail/MailMessageSender.java	Sat Oct 23 08:10:46 2004
@@ -17,7 +17,6 @@
 
 import org.apache.avalon.framework.CascadingRuntimeException;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -74,7 +73,7 @@
  */
 public class MailMessageSender
         extends AbstractLogEnabled
-        implements MailSender, Configurable, Serviceable, Initializable, Component {
+        implements MailSender, Configurable, Serviceable, Initializable {
 
     private ServiceManager manager;
 

Modified: cocoon/trunk/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java
==============================================================================
--- cocoon/trunk/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java	(original)
+++ cocoon/trunk/src/blocks/naming/java/org/apache/cocoon/components/naming/EntryManager.java	Sat Oct 23 08:10:46 2004
@@ -1,8 +1,9 @@
 package org.apache.cocoon.components.naming;
 
-import org.apache.avalon.framework.component.*;
-import javax.naming.directory.*;
 import java.util.Map;
+
+import javax.naming.directory.DirContext;
+
 import org.apache.cocoon.ProcessingException;
 
 
@@ -12,9 +13,11 @@
  *	@author Jeremy Quinn <a href="http://apache.org/~jeremy">http://apache.org/~jeremy</a>.
  */
 
-public interface  EntryManager extends Component {
-	String ROLE = EntryManager.class.getName();
-	int ADD_ATTRIBUTE = DirContext.ADD_ATTRIBUTE; 
+public interface EntryManager {
+	
+    String ROLE = EntryManager.class.getName();
+
+    int ADD_ATTRIBUTE = DirContext.ADD_ATTRIBUTE; 
 	int REMOVE_ATTRIBUTE = DirContext.REMOVE_ATTRIBUTE;
 	int REPLACE_ATTRIBUTE = DirContext.REPLACE_ATTRIBUTE;
 	

Modified: cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMF.java
==============================================================================
--- cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMF.java	(original)
+++ cocoon/trunk/src/blocks/ojb/java/org/apache/cocoon/ojb/jdo/components/JdoPMF.java	Sat Oct 23 08:10:46 2004
@@ -17,16 +17,14 @@
 
 import javax.jdo.PersistenceManager;
 
-import org.apache.avalon.framework.component.Component;
-
 /**
  *  Interface of the JDO Persistent Manager Factory.
  * It is used to get the Persistence Manager to interact with JDO using OJB
  *
  * @author <a href="mailto:antonio@apache.org">Antonio Gallardo</a>
- * @version CVS $Id: JdoPMF.java,v 1.3 2004/06/25 14:49:56 cziegeler Exp $
+ * @version CVS $Id$
 */
-public interface JdoPMF extends Component {
+public interface JdoPMF {
     
     String ROLE = JdoPMF.class.getName();
 	

Modified: cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/ElementProcessor.java
==============================================================================
--- cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/ElementProcessor.java	(original)
+++ cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/ElementProcessor.java	Sat Oct 23 08:10:46 2004
@@ -42,11 +42,9 @@
  * endProcessing method.
  *
  * @author Marc Johnson (marc_johnson27591@hotmail.com)
- * @version CVS $Id: ElementProcessor.java,v 1.3 2004/03/05 13:02:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface ElementProcessor
-                    extends org.apache.avalon.framework.component.Component
-{
+public interface ElementProcessor {
 
     String ROLE = ElementProcessor.class.getName();
     

Modified: cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/ElementProcessorFactory.java
==============================================================================
--- cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/ElementProcessorFactory.java	(original)
+++ cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/ElementProcessorFactory.java	Sat Oct 23 08:10:46 2004
@@ -15,17 +15,15 @@
  */
 package org.apache.cocoon.components.elementprocessor;
 
-import org.apache.avalon.framework.component.Component;
-
 /**
  * Create instances of specific ElementProcessor implementations to
  * handle specific XML elements and their content.
  *
  * @author Marc Johnson (marc_johnson27591@hotmail.com)
- * @version CVS $Id: ElementProcessorFactory.java,v 1.4 2004/03/05 13:02:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface ElementProcessorFactory extends Component
-{
+public interface ElementProcessorFactory {
+
     String ROLE = ElementProcessorFactory.class.getName();
 
     /**

Modified: cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/AbstractElementProcessorFactory.java
==============================================================================
--- cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/AbstractElementProcessorFactory.java	(original)
+++ cocoon/trunk/src/blocks/poi/java/org/apache/cocoon/components/elementprocessor/impl/AbstractElementProcessorFactory.java	Sat Oct 23 08:10:46 2004
@@ -20,7 +20,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 
 import org.apache.cocoon.components.elementprocessor.CannotCreateElementProcessorException;
@@ -32,11 +31,10 @@
  * handle specific XML elements and their content.
  *
  * @author Marc Johnson (marc_johnson27591@hotmail.com)
- * @version CVS $Id: AbstractElementProcessorFactory.java,v 1.4 2004/03/05 13:02:03 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public abstract class AbstractElementProcessorFactory
-     extends AbstractLogEnabled implements ElementProcessorFactory, Component
-{
+     extends AbstractLogEnabled implements ElementProcessorFactory {
 
     // uses XML element names as keys and ElementProcessor progenitors
     // as values. An ElementProcessor progenitor is an Object that can

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/components/persistence/CastorSourceConverter.java	Sat Oct 23 08:10:46 2004
@@ -25,7 +25,6 @@
 import java.util.Map.Entry;
 
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -63,7 +62,7 @@
  */
 public class CastorSourceConverter
     extends AbstractLogEnabled
-    implements Component, Serviceable, Configurable, Initializable, ThreadSafe {
+    implements Serviceable, Configurable, Initializable, ThreadSafe {
         
     public static final String ROLE = CastorSourceConverter.class.getName();
 

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java	Sat Oct 23 08:10:46 2004
@@ -16,7 +16,6 @@
 package org.apache.cocoon.components.variables;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
@@ -35,11 +34,11 @@
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  *
- * @version CVS $Id: DefaultVariableResolverFactory.java,v 1.3 2004/03/05 13:02:07 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class DefaultVariableResolverFactory 
     extends AbstractLogEnabled
-    implements ThreadSafe, VariableResolverFactory, Component, Serviceable, Contextualizable {
+    implements ThreadSafe, VariableResolverFactory, Serviceable, Contextualizable {
     
     protected ServiceManager manager;
     protected Context        context;

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java	Sat Oct 23 08:10:46 2004
@@ -17,7 +17,6 @@
 
 import java.util.List;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.portal.event.Event;
 
 /**
@@ -27,7 +26,7 @@
  * 
  * @version CVS $Id$
  */
-public interface LinkService extends Component {
+public interface LinkService {
 
     String ROLE = LinkService.class.getName();
     

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.portal.coplet.adapter;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.portal.coplet.CopletInstanceData;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
@@ -50,10 +49,9 @@
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
  * 
- * @version CVS $Id: CopletAdapter.java,v 1.7 2004/03/05 13:02:10 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface CopletAdapter 
-    extends Component {
+public interface CopletAdapter {
 
     String ROLE = CopletAdapter.class.getName();
     

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java	Sat Oct 23 08:10:46 2004
@@ -21,7 +21,6 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -52,7 +51,7 @@
  */
 public class DefaultCopletFactory  
     extends AbstractLogEnabled 
-    implements Component, ThreadSafe, CopletFactory, Serviceable, Disposable, Configurable {
+    implements ThreadSafe, CopletFactory, Serviceable, Disposable, Configurable {
     
     protected ServiceManager manager;
     

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java	Sat Oct 23 08:10:46 2004
@@ -29,7 +29,6 @@
 
 import org.apache.avalon.excalibur.io.IOUtil;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
@@ -67,11 +66,11 @@
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
  * 
- * @version CVS $Id: BasketManagerImpl.java,v 1.3 2004/03/05 13:02:11 bdelacretaz Exp $
+ * @version CVS $Id$
  */
 public class BasketManagerImpl
 extends AbstractLogEnabled
-implements BasketManager, Serviceable, Subscriber, Contextualizable, Initializable, Parameterizable, ThreadSafe, Component  {
+implements BasketManager, Serviceable, Subscriber, Contextualizable, Initializable, Parameterizable, ThreadSafe {
     
     /** The service manager */
     protected ServiceManager manager;

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/EventConverter.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/EventConverter.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/EventConverter.java	Sat Oct 23 08:10:46 2004
@@ -15,17 +15,15 @@
  */
 package org.apache.cocoon.portal.event;
 
-import org.apache.avalon.framework.component.Component;
-
 /**
  * Convert events from and into strings
  *
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
  * 
- * @version CVS $Id: EventConverter.java,v 1.3 2004/03/05 13:02:11 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface EventConverter extends Component {
+public interface EventConverter {
 
     String ROLE = EventConverter.class.getName();
     

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/EventManager.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/EventManager.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/EventManager.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.portal.event;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.ProcessingException;
 
 /**
@@ -33,9 +32,9 @@
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
  * @author Mauro Talevi
  * 
- * @version CVS $Id: EventManager.java,v 1.2 2004/03/05 13:02:11 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface EventManager extends Component {
+public interface EventManager {
  
     /**
      * Represents Role of the service

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/EventAspect.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/EventAspect.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/EventAspect.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.portal.event.aspect;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.portal.PortalService;
 
 /**
@@ -23,9 +22,9 @@
  * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
  * 
- * @version CVS $Id: EventAspect.java,v 1.2 2004/03/05 13:02:12 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface EventAspect extends Component {
+public interface EventAspect {
 
     String ROLE = EventAspect.class.getName();
     

Modified: cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
==============================================================================
--- cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java	(original)
+++ cocoon/trunk/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java	Sat Oct 23 08:10:46 2004
@@ -24,7 +24,6 @@
 import org.apache.avalon.framework.CascadingRuntimeException;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -128,7 +127,6 @@
 public class DefaultLayoutFactory
 	extends AbstractLogEnabled
     implements ThreadSafe, 
-                 Component, 
                  LayoutFactory, 
                  Configurable, 
                  Disposable, 

Modified: cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java	(original)
+++ cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java	Sat Oct 23 08:10:46 2004
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
@@ -46,11 +45,11 @@
  * Context manager
  * 
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: DefaultContextManager.java,v 1.7 2004/03/19 14:16:55 cziegeler Exp $
+ * @version CVS $Id$
 */
 public final class DefaultContextManager
 extends AbstractLogEnabled
-implements Serviceable, ContextManager, ThreadSafe, Component, Contextualizable, Disposable {
+implements Serviceable, ContextManager, ThreadSafe, Contextualizable, Disposable {
 
     /** The <code>ServiceManager</code> */
     private ServiceManager manager;

Modified: cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java	(original)
+++ cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java	Sat Oct 23 08:10:46 2004
@@ -19,7 +19,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
@@ -44,11 +43,11 @@
  * Form handling
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: DefaultFormManager.java,v 1.8 2004/04/15 08:51:31 cziegeler Exp $
+ * @version CVS $Id$
 */
 public final class DefaultFormManager
 extends AbstractLogEnabled
-implements Serviceable, Component, FormManager, ThreadSafe, Contextualizable {
+implements Serviceable, FormManager, ThreadSafe, Contextualizable {
 
     /** This session attribute is used to store the information for the inputxml tags */
     private static final String ATTRIBUTE_INPUTXML_STORAGE = "org.apache.cocoon.webapps.session.InputXMLStorage";

Modified: cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java	(original)
+++ cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.webapps.session.components;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -32,11 +31,11 @@
  * This is the default implementation for the media manager
  * 
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: DefaultMediaManager.java,v 1.3 2004/03/05 13:02:22 bdelacretaz Exp $
+ * @version CVS $Id$
 */
 public final class DefaultMediaManager
 extends AbstractLogEnabled
-implements MediaManager, Configurable, ThreadSafe, Contextualizable, Component {
+implements MediaManager, Configurable, ThreadSafe, Contextualizable {
 
     /** The media Types */
     protected PreparedMediaType[] allMediaTypes;

Modified: cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java	(original)
+++ cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java	Sat Oct 23 08:10:46 2004
@@ -16,7 +16,6 @@
 package org.apache.cocoon.webapps.session.components;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
@@ -46,11 +45,11 @@
  *  This is the default implementation of the session manager
  *
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: DefaultSessionManager.java,v 1.7 2004/06/18 14:28:56 vgritsenko Exp $
+ * @version CVS $Id$
 */
 public final class DefaultSessionManager
 extends AbstractLogEnabled
-implements Serviceable, Component, ThreadSafe, SessionManager, Disposable, Contextualizable {
+implements Serviceable, ThreadSafe, SessionManager, Disposable, Contextualizable {
 
     /** The context */
     private Context context;

Modified: cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java
==============================================================================
--- cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java	(original)
+++ cocoon/trunk/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java	Sat Oct 23 08:10:46 2004
@@ -18,7 +18,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
@@ -35,11 +34,11 @@
  * This is the default implementation for the transaction manager.
  * 
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: DefaultTransactionManager.java,v 1.4 2004/03/05 13:02:22 bdelacretaz Exp $
+ * @version CVS $Id$
 */
 public final class DefaultTransactionManager
 extends AbstractLogEnabled
-implements Component, ThreadSafe, TransactionManager, Contextualizable {
+implements ThreadSafe, TransactionManager, Contextualizable {
 
     protected Context context;
 

Modified: cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java
==============================================================================
--- cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java	(original)
+++ cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java	Sat Oct 23 08:10:46 2004
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.Contextualizable;
@@ -60,9 +59,9 @@
  * JXPath does not automatically create sessions.
  *
  * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
- * @version CVS $Id: JXPathCocoonContexts.java,v 1.5 2004/03/05 13:02:24 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public final class JXPathCocoonContexts implements Component, Contextualizable, Recyclable {
+public final class JXPathCocoonContexts implements Contextualizable, Recyclable {
     
     public static final String ROLE = JXPathCocoonContexts.class.getName();
     private static JXPathContextFactory factory;

Modified: cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java
==============================================================================
--- cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java	(original)
+++ cocoon/trunk/src/blocks/taglib/java/org/apache/cocoon/transformation/TagTransformer.java	Sat Oct 23 08:10:46 2004
@@ -17,7 +17,6 @@
 
 import org.apache.avalon.excalibur.pool.Recyclable;
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentSelector;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -171,7 +170,7 @@
             Tag tag = (Tag) tagStack.pop();
             if (tag == null)
                 continue;
-            ComponentSelector tagSelector = (ComponentSelector)tagSelectorStack.pop();
+            ServiceSelector tagSelector = (ServiceSelector)tagSelectorStack.pop();
             tagSelector.release(tag);
 
             tagNamespaceSelector.release(tagSelector);
@@ -315,9 +314,9 @@
         Tag tag = null;
         if (namespaceURI != null && namespaceURI.length() > 0) {
             // Try to find Tag corresponding to this element
-            ComponentSelector tagSelector = null;
+            ServiceSelector tagSelector = null;
             try {
-                tagSelector = (ComponentSelector) tagNamespaceSelector.select(namespaceURI);
+                tagSelector = (ServiceSelector) tagNamespaceSelector.select(namespaceURI);
                 tagSelectorStack.push(tagSelector);
 
                 // namespace matches tag library, lookup tag now.
@@ -383,7 +382,7 @@
 
         Tag tag = (Tag) tagStack.pop();
         if (tag != null) {
-            ComponentSelector tagSelector = (ComponentSelector)tagSelectorStack.pop();
+            ServiceSelector tagSelector = (ServiceSelector)tagSelectorStack.pop();
             try {
                 if (saxFragment != null) {
                     // Start Iteration

Modified: cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/DefaultCacheManager.java
==============================================================================
--- cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/DefaultCacheManager.java	(original)
+++ cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/DefaultCacheManager.java	Sat Oct 23 08:10:46 2004
@@ -18,7 +18,6 @@
 import java.io.IOException;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -34,11 +33,11 @@
 /**
  * Component implementing the {@link CacheManager} role.
  * 
- * @version $Id: DefaultCacheManager.java,v 1.6 2004/03/09 13:54:25 reinhard Exp $
+ * @version $Id$
  */
 public class DefaultCacheManager 
   extends AbstractLogEnabled 
-  implements CacheManager, ThreadSafe, Serviceable, Disposable, Configurable, Component {
+  implements CacheManager, ThreadSafe, Serviceable, Disposable, Configurable {
       
     protected ServiceManager manager;
     protected Configuration configuration;

Modified: cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/DefaultFormManager.java
==============================================================================
--- cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/DefaultFormManager.java	(original)
+++ cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/DefaultFormManager.java	Sat Oct 23 08:10:46 2004
@@ -18,7 +18,6 @@
 import org.apache.avalon.framework.CascadingException;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -45,7 +44,7 @@
  */
 public class DefaultFormManager
   extends AbstractLogEnabled
-  implements FormManager, ThreadSafe, Serviceable, Disposable, Configurable, Component, Initializable {
+  implements FormManager, ThreadSafe, Serviceable, Disposable, Configurable, Initializable {
 
     protected static final String PREFIX = "WoodyForm:";
     protected ServiceManager manager;

Modified: cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/expression/DefaultExpressionManager.java
==============================================================================
--- cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/expression/DefaultExpressionManager.java	(original)
+++ cocoon/trunk/src/blocks/woody/java/org/apache/cocoon/woody/expression/DefaultExpressionManager.java	Sat Oct 23 08:10:46 2004
@@ -16,7 +16,6 @@
 
 package org.apache.cocoon.woody.expression;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -36,10 +35,10 @@
  *   &lt;function name="MyFunction" class="net.foo.MyFunction"/&gt;
  * </pre>
  * 
- * @version CVS $Id: DefaultExpressionManager.java,v 1.6 2004/03/09 13:54:24 reinhard Exp $
+ * @version CVS $Id$
  */
 public class DefaultExpressionManager
-        implements ExpressionManager, Component, Configurable, ThreadSafe {
+        implements ExpressionManager, Configurable, ThreadSafe {
     
     private DefaultFunctionFactory factory;
     

Modified: cocoon/trunk/src/java/org/apache/cocoon/acting/Action.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/acting/Action.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/acting/Action.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.acting;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.environment.Redirector;
 import org.apache.cocoon.environment.SourceResolver;
@@ -25,9 +24,9 @@
 /**
  *
  * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Id: Action.java,v 1.2 2004/03/05 13:02:43 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface Action extends Component {
+public interface Action {
 
     String ROLE = Action.class.getName();
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/caching/Cache.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/caching/Cache.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/caching/Cache.java	Sat Oct 23 08:10:46 2004
@@ -17,7 +17,6 @@
 
 import java.io.Serializable;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.cocoon.ProcessingException;
 
 /**
@@ -28,10 +27,9 @@
  *
  * @since 2.1
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: Cache.java,v 1.5 2004/03/05 13:02:45 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface Cache
-extends Component {
+public interface Cache {
 
     /** The Avalon Role **/
     String ROLE = Cache.class.getName();

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java	Sat Oct 23 08:10:46 2004
@@ -15,8 +15,6 @@
  */
 package org.apache.cocoon.components.classloader;
 
-import org.apache.avalon.framework.component.Component;
-
 import java.io.File;
 import java.io.IOException;
 
@@ -27,9 +25,9 @@
  * that it can be safely reinstantiated for dynamic class reloading
  *
  * @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Id: ClassLoaderManager.java,v 1.2 2004/03/05 13:02:46 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface ClassLoaderManager extends Component {
+public interface ClassLoaderManager {
 
     String ROLE = ClassLoaderManager.class.getName();
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/crawler/CocoonCrawler.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/crawler/CocoonCrawler.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/crawler/CocoonCrawler.java	Sat Oct 23 08:10:46 2004
@@ -15,9 +15,6 @@
  */
 package org.apache.cocoon.components.crawler;
 
-
-import org.apache.avalon.framework.component.Component;
-
 import java.net.URL;
 import java.util.Iterator;
 
@@ -25,10 +22,9 @@
  * The avalon behavioural component interface of crawling.
  *
  * @author <a href="mailto:berni_huber@a1.net">Bernhard Huber</a>
- * @version CVS $Id: CocoonCrawler.java,v 1.5 2004/03/05 13:02:46 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface CocoonCrawler extends Component
-{
+public interface CocoonCrawler {
     /**
      * Role name of this avalon component.
      * Its value is <code>org.apache.cocoon.components.crawler.CocoonCrawler</code>.

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java	Sat Oct 23 08:10:46 2004
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -57,7 +56,7 @@
  */
 public abstract class AbstractInterpreter
         extends AbstractLogEnabled
-        implements Component, Serviceable, Contextualizable, Interpreter,
+        implements Serviceable, Contextualizable, Interpreter,
                    SingleThreaded, Configurable, Disposable {
 
     // The instance ID of this interpreter, used to identify user scopes

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java	Sat Oct 23 08:10:46 2004
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.components.flow;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.context.Context;
@@ -54,7 +53,7 @@
  */
 public class ContinuationsManagerImpl
         extends AbstractLogEnabled
-        implements ContinuationsManager, Component, Configurable,
+        implements ContinuationsManager, Configurable,
                    ThreadSafe, Contextualizable, Instrumentable {
 
     static final int CONTINUATION_ID_LENGTH = 20;

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/InputModule.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/InputModule.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/modules/input/InputModule.java	Sat Oct 23 08:10:46 2004
@@ -16,7 +16,6 @@
 
 package org.apache.cocoon.components.modules.input;
 
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
@@ -29,9 +28,9 @@
  * attributes, session attributes &c.
  *
  * @author <a href="mailto:haul@apache.org">Christian Haul</a>
- * @version CVS $Id: InputModule.java,v 1.3 2004/03/05 13:02:48 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface InputModule extends Component {
+public interface InputModule {
 
     String ROLE = InputModule.class.getName();
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/notification/DefaultNotifyingBuilder.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/notification/DefaultNotifyingBuilder.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/notification/DefaultNotifyingBuilder.java	Sat Oct 23 08:10:46 2004
@@ -15,8 +15,6 @@
  */
 package org.apache.cocoon.components.notification;
 
-import org.apache.avalon.framework.component.Component;
-
 import org.apache.commons.lang.SystemUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.xml.sax.SAXParseException;
@@ -35,7 +33,7 @@
  * @author Marc Liyanage (futureLAB AG)
  * @version CVS $Id$
  */
-public class DefaultNotifyingBuilder implements NotifyingBuilder, Component {
+public class DefaultNotifyingBuilder implements NotifyingBuilder {
 
     /**
      * Builds a Notifying object (SimpleNotifyingBean in this case)

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java	Sat Oct 23 08:10:46 2004
@@ -16,7 +16,6 @@
 package org.apache.cocoon.components.pipeline;
 
 import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
@@ -64,7 +63,7 @@
  */
 public abstract class AbstractProcessingPipeline
   extends AbstractLogEnabled
-  implements ProcessingPipeline, Parameterizable, Recyclable, Serviceable, Component {
+  implements ProcessingPipeline, Parameterizable, Recyclable, Serviceable {
 
     // Generator stuff
     protected Generator generator;

Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/GeneratorFactory.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/generation/GeneratorFactory.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/generation/GeneratorFactory.java	Sat Oct 23 08:10:46 2004
@@ -15,8 +15,6 @@
  */
 package org.apache.cocoon.generation;
 
-import org.apache.avalon.framework.component.Component;
-
 /**
  * A generator factory is the factory of {@link Generator}s.
  *
@@ -38,7 +36,7 @@
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  * @version CVS $Id$
  */
-public interface GeneratorFactory extends Component {
+public interface GeneratorFactory {
 
     String ROLE = Generator.ROLE;
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/i18n/Bundle.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/i18n/Bundle.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/i18n/Bundle.java	Sat Oct 23 08:10:46 2004
@@ -17,16 +17,14 @@
 
 import java.util.MissingResourceException;
 
-import org.apache.avalon.framework.component.Component;
-
 /**
  * Resource bundle component interface. 
  * Provide the minimal number of methods to be used for i18n.
  *
  * @author <a href="mailto:kpiroumian@apache.org">Konstantin Piroumian</a>
- * @version CVS $Id: Bundle.java,v 1.4 2004/03/05 13:02:56 bdelacretaz Exp $
+ * @version CVS $Id$
  */
-public interface Bundle extends Component {
+public interface Bundle {
 
     String ROLE = Bundle.class.getName();
 

Modified: cocoon/trunk/src/java/org/apache/cocoon/i18n/BundleFactory.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/i18n/BundleFactory.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/i18n/BundleFactory.java	Sat Oct 23 08:10:46 2004
@@ -17,9 +17,6 @@
 
 import java.util.Locale;
 
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-
 /**
  * Bundle Factory implementations are responsible for loading and providing
  * particular types of resource bundles, implementors of Bundle interface.
@@ -28,7 +25,7 @@
  * @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
  * @version CVS $Id$
  */
-public interface BundleFactory extends Component {
+public interface BundleFactory {
 
     /**
      * Bundle factory ROLE name
@@ -53,7 +50,7 @@
      * @return        the bundle
      * @exception     ComponentException if a bundle is not found
      */
-    Bundle select(String base, String bundleName, String locale) throws ComponentException;
+    Bundle select(String base, String bundleName, String locale) throws Exception;
 
     /**
      * Select a bundle based on the catalogue base location, bundle name,
@@ -65,7 +62,7 @@
      * @return        the bundle
      * @exception     ComponentException if a bundle is not found
      */
-    Bundle select(String base, String bundleName, Locale locale) throws ComponentException;
+    Bundle select(String base, String bundleName, Locale locale) throws Exception;
 
     /**
      * Select a bundle based on the catalogue base location, bundle name,
@@ -77,7 +74,7 @@
      * @return        the bundle
      * @exception     ComponentException if a bundle is not found
      */
-    Bundle select(String[] directories, String bundleName, Locale locale) throws ComponentException;
+    Bundle select(String[] directories, String bundleName, Locale locale) throws Exception;
 
     /**
      * Select a bundle based on the bundle name and the locale name from
@@ -88,7 +85,7 @@
      * @return        the bundle
      * @exception     ComponentException if a bundle is not found
      */
-    Bundle select(String bundleName, String locale) throws ComponentException;
+    Bundle select(String bundleName, String locale) throws Exception;
 
     /**
      * Select a bundle based on the bundle name and the locale from
@@ -99,7 +96,7 @@
      * @return        the bundle
      * @exception     ComponentException if a bundle is not found
      */
-    Bundle select(String bundleName, Locale locale) throws ComponentException;
+    Bundle select(String bundleName, Locale locale) throws Exception;
 
     void release(Bundle bundle);
 }

Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java	Sat Oct 23 08:10:46 2004
@@ -19,7 +19,6 @@
 import java.net.URL;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
@@ -55,7 +54,7 @@
  * log, so actually cached content is never updated!
  * 
  *  @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- *  @version CVS $Id: DefaultIncludeCacheManager.java,v 1.8 2004/03/18 07:42:12 cziegeler Exp $
+ *  @version CVS $Id$
  *  @since   2.1
  */
 public final class DefaultIncludeCacheManager
@@ -64,8 +63,7 @@
                 ThreadSafe, 
                 Serviceable, 
                 Disposable,
-                Parameterizable, 
-                Component {
+                Parameterizable {
 
     private ServiceManager manager;
     

Modified: cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java	Sat Oct 23 08:10:46 2004
@@ -249,7 +249,7 @@
             fail("Could not retrieve action: " + ce.toString());
         } finally {
             if (action != null) {
-                selector.release(action);
+                selector.release((Component)action);
             }
             this.manager.release(selector);
             this.manager.release(resolver);

Mime
View raw message