cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java JavaLanguage.java
Date Sat, 07 Feb 2004 15:20:10 GMT
joerg       2004/02/07 07:20:09

  Modified:    src/java/org/apache/cocoon/transformation/pagination
                        Paginator.java
               src/java/org/apache/cocoon/serialization
                        ZipArchiveSerializer.java
               src/java/org/apache/cocoon/components/xpointer
                        XPointerContext.java XPointerPart.java
               src/blocks/eventcache/java/org/apache/cocoon/caching/impl
                        StoreEventRegistryImpl.java
                        EventAwareCacheImpl.java
               src/java/org/apache/cocoon/transformation
                        XIncludeTransformer.java
               src/java/org/apache/cocoon/components/xscript
                        XScriptManagerImpl.java XScriptObject.java
                        XScriptObjectFromURL.java
               src/java/org/apache/cocoon/components/language/markup
                        Logicsheet.java NamedLogicsheet.java
                        AbstractMarkupLanguage.java
               src/java/org/apache/cocoon/caching/impl CacheImpl.java
               src/java/org/apache/cocoon/components/language/programming/java
                        JavaLanguage.java
  Log:
  Composable => Serviceable
  
  Revision  Changes    Path
  1.4       +10 -10    cocoon-2.1/src/java/org/apache/cocoon/transformation/pagination/Paginator.java
  
  Index: Paginator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/pagination/Paginator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Paginator.java	22 Oct 2003 12:41:23 -0000	1.3
  +++ Paginator.java	7 Feb 2004 15:20:09 -0000	1.4
  @@ -51,10 +51,10 @@
   package org.apache.cocoon.transformation.pagination;
   
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.environment.ObjectModelHelper;
  @@ -86,13 +86,13 @@
    * @version    CVS $Id$
    */
   public class Paginator extends AbstractTransformer
  -  implements Composable, Disposable, CacheableProcessingComponent {
  +  implements Serviceable, Disposable, CacheableProcessingComponent {
   
       public static final String PAGINATE_URI = "http://apache.org/cocoon/paginate/1.0";
       public static final String PAGINATE_PREFIX = "page";
       public static final String PAGINATE_PREFIX_TOKEN = PAGINATE_PREFIX+":";
   
  -    private ComponentManager manager;
  +    private ServiceManager manager;
       private SAXParser parser;
       private Store store;
       private SourceResolver resolver;
  @@ -107,12 +107,12 @@
       private boolean prefixMapping;
   
       /**
  -     * Set the current <code>ComponentManager</code> instance used by this
  -     * <code>Composable</code>.
  +     * Set the current <code>ServiceManager</code> instance used by this
  +     * <code>Serviceable</code>.
        *
        * @param  manager  Description of the Parameter
        */
  -    public void compose(ComponentManager manager) {
  +    public void service(ServiceManager manager) throws ServiceException {
           try {
               this.manager = manager;
               getLogger().debug("Looking up "+SAXParser.ROLE);
  @@ -129,7 +129,7 @@
        */
       public void dispose() {
           if (this.parser!=null) {
  -            this.manager.release((Component) this.parser);
  +            this.manager.release(this.parser);
           } else {
               this.parser = null;
           }
  
  
  
  1.6       +12 -12    cocoon-2.1/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java
  
  Index: ZipArchiveSerializer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ZipArchiveSerializer.java	6 Jul 2003 11:35:40 -0000	1.5
  +++ ZipArchiveSerializer.java	7 Feb 2004 15:20:09 -0000	1.6
  @@ -59,10 +59,10 @@
   import java.util.zip.ZipOutputStream;
   
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.ComponentSelector;
  -import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.ServiceSelector;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceResolver;
   import org.xml.sax.Attributes;
  @@ -113,7 +113,7 @@
   
   public class ZipArchiveSerializer 
       extends AbstractSerializer 
  -    implements Composable, Disposable {
  +    implements Disposable, Serviceable {
           
       /**
        * The namespace for elements handled by this serializer,
  @@ -126,10 +126,10 @@
       private static final int IN_CONTENT_STATE = 2;
   
       /** The component manager */
  -    protected ComponentManager manager;
  +    protected ServiceManager manager;
   
       /** The serializer component selector */
  -    protected ComponentSelector selector;
  +    protected ServiceSelector selector;
   
       /** The Zip stream where entries will be written */
       protected ZipOutputStream zipOutput;
  @@ -159,11 +159,11 @@
   
   
       /**
  -     * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
  +     * @see org.apache.avalon.framework.service.Serviceable#service(ServiceManager)
        */
  -    public void compose(ComponentManager manager) throws ComponentException {
  +    public void service(ServiceManager manager) throws ServiceException {
           this.manager = manager;
  -        this.resolver = (SourceResolver)this.manager.lookup( SourceResolver.ROLE);
  +        this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
       }
   
       /**
  @@ -312,7 +312,7 @@
                   // Serialize content
                   if (this.selector == null) {
                       this.selector =
  -                        (ComponentSelector) this.manager.lookup(Serializer.ROLE + "Selector");
  +                        (ServiceSelector) this.manager.lookup(Serializer.ROLE + "Selector");
                   }
   
                   // Get the serializer
  
  
  
  1.3       +6 -6      cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/XPointerContext.java
  
  Index: XPointerContext.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/XPointerContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XPointerContext.java	26 Nov 2003 19:08:30 -0000	1.2
  +++ XPointerContext.java	7 Feb 2004 15:20:09 -0000	1.3
  @@ -54,7 +54,7 @@
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.xml.xpath.PrefixResolver;
   import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.ResourceNotFoundException;
  @@ -72,7 +72,7 @@
       private Logger logger;
       private String xpointer;
       private HashMap prefixes = new HashMap();
  -    private ComponentManager componentManager;
  +    private ServiceManager manager;
   
       /**
        * Constructs an XPointerContext object.
  @@ -81,11 +81,11 @@
        * @param source the source into which the xpointer points
        * @param xmlConsumer the consumer to which the result of the xpointer evaluation should
be send
        */
  -    public XPointerContext(String xpointer, Source source, XMLConsumer xmlConsumer, Logger
logger, ComponentManager componentManager) {
  +    public XPointerContext(String xpointer, Source source, XMLConsumer xmlConsumer, Logger
logger, ServiceManager manager) {
           this.source = source;
           this.xmlConsumer = xmlConsumer;
           this.logger = logger;
  -        this.componentManager = componentManager;
  +        this.manager = manager;
           this.xpointer = xpointer;
   
           prefixes.put("xml", "http://www.w3.org/XML/1998/namespace");
  @@ -120,8 +120,8 @@
           return xpointer;
       }
   
  -    public ComponentManager getComponentManager() {
  -        return componentManager;
  +    public ServiceManager getServiceManager() {
  +        return manager;
       }
   
       public void addPrefix(String prefix, String namespace) throws SAXException {
  
  
  
  1.4       +3 -4      cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/XPointerPart.java
  
  Index: XPointerPart.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/XPointerPart.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XPointerPart.java	26 Nov 2003 19:08:30 -0000	1.3
  +++ XPointerPart.java	7 Feb 2004 15:20:09 -0000	1.4
  @@ -50,8 +50,7 @@
   */
   package org.apache.cocoon.components.xpointer;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.dom.DOMStreamer;
   import org.apache.cocoon.ResourceNotFoundException;
  @@ -73,7 +72,7 @@
   
       public boolean process(XPointerContext xpointerContext) throws SAXException, ResourceNotFoundException
{
           Document document = xpointerContext.getDocument();
  -        ComponentManager manager = xpointerContext.getComponentManager();
  +        ServiceManager manager = xpointerContext.getServiceManager();
           XPathProcessor xpathProcessor = null;
           try {
               try {
  @@ -100,7 +99,7 @@
               }
           } finally {
               if (xpathProcessor != null)
  -                manager.release((Component)xpathProcessor);
  +                manager.release(xpathProcessor);
           }
       }
   }
  
  
  
  1.3       +7 -7      cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/StoreEventRegistryImpl.java
  
  Index: StoreEventRegistryImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/StoreEventRegistryImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StoreEventRegistryImpl.java	9 Sep 2003 18:52:33 -0000	1.2
  +++ StoreEventRegistryImpl.java	7 Feb 2004 15:20:09 -0000	1.3
  @@ -52,9 +52,9 @@
   
   import java.io.IOException;
   
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.excalibur.store.Store;
   
   /**
  @@ -68,9 +68,9 @@
    * @version CVS $Id$
    */
   public class StoreEventRegistryImpl 
  -		extends DefaultEventRegistryImpl implements Composable {
  +		extends DefaultEventRegistryImpl implements Serviceable {
   	private static final String EVENTREGISTRYKEY = "EVENTREGWRAPPER";
  -	private ComponentManager m_manager;
  +	private ServiceManager m_manager;
   	private Store m_persistentStore;
   	
   	/** 
  @@ -94,7 +94,7 @@
   	/**
   	 * Obtain a reference to the Store
   	 */
  -	public void compose(ComponentManager manager) throws ComponentException {
  +	public void service(ServiceManager manager) throws ServiceException {
   		this.m_manager = manager;
   		this.m_persistentStore = (Store)manager.lookup(Store.PERSISTENT_STORE);
   	}
  
  
  
  1.8       +8 -9      cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java
  
  Index: EventAwareCacheImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/EventAwareCacheImpl.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EventAwareCacheImpl.java	28 Oct 2003 13:39:36 -0000	1.7
  +++ EventAwareCacheImpl.java	7 Feb 2004 15:20:09 -0000	1.8
  @@ -49,8 +49,8 @@
   import java.util.Iterator;
   
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CachedResponse;
   import org.apache.cocoon.caching.EventAware;
  @@ -68,11 +68,10 @@
    * @author Geoff Howard (ghoward@apache.org)
    * @version $Id$
    */
  -public class EventAwareCacheImpl 
  -        extends CacheImpl 
  -        implements Initializable, EventAware {
  +public class EventAwareCacheImpl extends CacheImpl implements Initializable,
  +                                                              EventAware {
       
  -    private ComponentManager m_manager;
  +    private ServiceManager m_manager;
   
   	private EventRegistry m_eventRegistry;
   
  @@ -116,9 +115,9 @@
       /**
        * Look up the EventRegistry 
        */
  -	public void compose(ComponentManager manager) throws ComponentException {
  +	public void service(ServiceManager manager) throws ServiceException {
   		this.m_manager = manager;
  -        super.compose(manager);
  +        super.service(manager);
           this.m_eventRegistry = (EventRegistry)manager.lookup(EventRegistry.ROLE);
   	}
   
  
  
  
  1.12      +6 -6      cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
  
  Index: XIncludeTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- XIncludeTransformer.java	6 Feb 2004 15:41:21 -0000	1.11
  +++ XIncludeTransformer.java	7 Feb 2004 15:20:09 -0000	1.12
  @@ -50,9 +50,9 @@
   */
   package org.apache.cocoon.transformation;
   
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.CascadingException;
   import org.apache.cocoon.ProcessingException;
  @@ -86,9 +86,9 @@
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a> (wrote the
original version)
    * @version CVS $Id$
    */
  -public class XIncludeTransformer extends AbstractTransformer implements Composable {
  +public class XIncludeTransformer extends AbstractTransformer implements Serviceable {
       protected SourceResolver resolver;
  -    protected ComponentManager manager;
  +    protected ServiceManager manager;
       private XIncludePipe xIncludePipe;
   
       public static final String XMLBASE_NAMESPACE_URI = "http://www.w3.org/XML/1998/namespace";
  @@ -122,7 +122,7 @@
           xIncludePipe.setLexicalHandler(handler);
       }
   
  -    public void compose(ComponentManager manager) {
  +    public void service(ServiceManager manager) {
           this.manager = manager;
       }
   
  
  
  
  1.2       +10 -11    cocoon-2.1/src/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java
  
  Index: XScriptManagerImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XScriptManagerImpl.java	9 Mar 2003 00:09:27 -0000	1.1
  +++ XScriptManagerImpl.java	7 Feb 2004 15:20:09 -0000	1.2
  @@ -51,13 +51,13 @@
   package org.apache.cocoon.components.xscript;
   
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   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;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.context.ContextException;
  @@ -79,14 +79,14 @@
    */
   public class XScriptManagerImpl
           extends AbstractLogEnabled
  -        implements XScriptManager, Composable, Component, Parameterizable, Contextualizable,
ThreadSafe
  +        implements XScriptManager, Serviceable, Component, Parameterizable, Contextualizable,
ThreadSafe
   {
       public static final String CONTEXT = "org.apache.cocoon.components.xscript.scope";
   
       /**
  -     * The <code>ComponentManager</code> instance.
  +     * The <code>ServiceManager</code> instance.
        */
  -    protected ComponentManager manager = null;
  +    protected ServiceManager manager = null;
   
       /**
        * The <code>Context</code> instance.
  @@ -100,16 +100,15 @@
           this.context = (Context)context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
       }
   
  -    public void compose(ComponentManager manager)
  -            throws ComponentException
  +    public void service(ServiceManager manager) throws ServiceException
       {
           this.manager = manager;
       }
   
       public void register(XScriptObject object) {
           try {
  -            object.compose(manager);
  -        } catch (ComponentException ignored) { }
  +            object.service(manager);
  +        } catch (ServiceException ignored) { }
       }
   
       public void parameterize(Parameters params)
  
  
  
  1.3       +12 -13    cocoon-2.1/src/java/org/apache/cocoon/components/xscript/XScriptObject.java
  
  Index: XScriptObject.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xscript/XScriptObject.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XScriptObject.java	11 Mar 2003 14:42:54 -0000	1.2
  +++ XScriptObject.java	7 Feb 2004 15:20:09 -0000	1.3
  @@ -50,11 +50,10 @@
   */
   package org.apache.cocoon.components.xscript;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   
   import org.apache.excalibur.xml.xslt.XSLTProcessor;
   import org.apache.excalibur.xml.xslt.XSLTProcessorException;
  @@ -83,7 +82,7 @@
    * @version CVS $Id$
    * @since August  4, 2001
    */
  -public abstract class XScriptObject implements Source, Composable {
  +public abstract class XScriptObject implements Source, Serviceable {
   
       /**
        * The creation date of this <code>XScriptObject</code>.
  @@ -96,7 +95,7 @@
        */
       XScriptManager xscriptManager;
   
  -    protected ComponentManager componentManager;
  +    protected ServiceManager serviceManager;
   
       /**
        * Creates a new <code>XScriptObject</code> instance.
  @@ -108,8 +107,8 @@
           ((XScriptManagerImpl) this.xscriptManager).register(this);
       }
   
  -    public void compose(ComponentManager manager) throws ComponentException {
  -        this.componentManager = manager;
  +    public void service(ServiceManager manager) throws ServiceException {
  +        this.serviceManager = manager;
       }
   
       /**
  @@ -132,12 +131,12 @@
               StreamResult result = new StreamResult(writer);
   
               XSLTProcessor transformer
  -                    = (XSLTProcessor) componentManager.lookup(XSLTProcessor.ROLE);
  +                    = (XSLTProcessor) serviceManager.lookup(XSLTProcessor.ROLE);
   
               try {
                   transformer.transform(this, stylesheet, params, result);
               } finally {
  -                componentManager.release(transformer);
  +                serviceManager.release(transformer);
               }
   
               return new XScriptObjectResult(xscriptManager, writer.toString());
  @@ -158,7 +157,7 @@
       public void toSAX(ContentHandler handler) throws SAXException {
           SAXParser parser = null;
           try {
  -            parser = (SAXParser) componentManager.lookup(SAXParser.ROLE);
  +            parser = (SAXParser) serviceManager.lookup(SAXParser.ROLE);
               InputSource source = getInputSource();
               parser.parse(source, handler);
           } catch (SAXException e) {
  @@ -167,7 +166,7 @@
               throw new SAXException(e);
           } finally {
               if (parser != null) {
  -                componentManager.release((Component)parser);
  +                serviceManager.release(parser);
               }
           }
       }
  
  
  
  1.3       +3 -3      cocoon-2.1/src/java/org/apache/cocoon/components/xscript/XScriptObjectFromURL.java
  
  Index: XScriptObjectFromURL.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xscript/XScriptObjectFromURL.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XScriptObjectFromURL.java	11 Mar 2003 14:42:54 -0000	1.2
  +++ XScriptObjectFromURL.java	7 Feb 2004 15:20:09 -0000	1.3
  @@ -88,7 +88,7 @@
           SourceResolver resolver = null;
           Source source = null;
           try {
  -            resolver = (SourceResolver) componentManager.lookup(SourceResolver.ROLE);
  +            resolver = (SourceResolver) serviceManager.lookup(SourceResolver.ROLE);
               source = resolver.resolveURI(this.systemId);
               return source.getInputStream();
           } catch (Exception e) {
  @@ -96,7 +96,7 @@
           } finally {
               if (resolver != null) {
                   resolver.release(source);
  -                componentManager.release(resolver);
  +                serviceManager.release(resolver);
               }
           }
       }
  
  
  
  1.3       +8 -8      cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java
  
  Index: Logicsheet.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/Logicsheet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Logicsheet.java	22 May 2003 13:02:47 -0000	1.2
  +++ Logicsheet.java	7 Feb 2004 15:20:09 -0000	1.3
  @@ -52,9 +52,9 @@
   
   import org.apache.excalibur.xml.xslt.XSLTProcessor;
   import org.apache.excalibur.xml.xslt.XSLTProcessorException;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.excalibur.source.Source;
  @@ -104,11 +104,11 @@
       protected Map namespaceURIs = new HashMap();
   
       /**
  -     * The ComponentManager of this instance.
  +     * The ServiceManager of this instance.
        */
  -    private ComponentManager manager;
  +    private ServiceManager manager;
   
  -    public Logicsheet(Source source, ComponentManager manager, SourceResolver resolver)
  +    public Logicsheet(Source source, ServiceManager manager, SourceResolver resolver)
           throws SAXException, IOException, ProcessingException
       {
           this.resolver = resolver;
  @@ -116,7 +116,7 @@
           this.manager = manager;
       }
   
  -    public Logicsheet(String systemId, ComponentManager manager, SourceResolver resolver)
  +    public Logicsheet(String systemId, ServiceManager manager, SourceResolver resolver)
           throws SAXException, IOException, SourceException, ProcessingException
       {
           this.resolver = resolver;
  @@ -167,7 +167,7 @@
               XMLFilter saveNSFilter = new SaveNamespaceFilter(namespaceURIs);
               return xsltProcessor.getTransformerHandler(source, saveNSFilter);
   
  -        } catch (ComponentException e) {
  +        } catch (ServiceException e) {
               throw new ProcessingException("Could not obtain XSLT processor", e);
           } catch (MalformedURLException e) {
               throw new ProcessingException("Could not resolve " + this.systemId, e);
  
  
  
  1.3       +3 -3      cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/NamedLogicsheet.java
  
  Index: NamedLogicsheet.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/NamedLogicsheet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamedLogicsheet.java	22 May 2003 13:02:47 -0000	1.2
  +++ NamedLogicsheet.java	7 Feb 2004 15:20:09 -0000	1.3
  @@ -50,7 +50,7 @@
   */
   package org.apache.cocoon.components.language.markup;
   
  -import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.ProcessingException;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceResolver;
  @@ -80,7 +80,7 @@
        */
       private String prefix;
   
  -    public NamedLogicsheet(String systemId, ComponentManager manager, SourceResolver resolver)
  +    public NamedLogicsheet(String systemId, ServiceManager manager, SourceResolver resolver)
           throws IOException, ProcessingException, SourceException, SAXException
       {
           super(systemId, manager, resolver);
  
  
  
  1.4       +10 -10    cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
  
  Index: AbstractMarkupLanguage.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractMarkupLanguage.java	23 Dec 2003 15:28:33 -0000	1.3
  +++ AbstractMarkupLanguage.java	7 Feb 2004 15:20:09 -0000	1.4
  @@ -51,9 +51,6 @@
   package org.apache.cocoon.components.language.markup;
   
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  @@ -61,6 +58,9 @@
   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;
  +import org.apache.avalon.framework.service.Serviceable;
   
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.excalibur.source.Source;
  @@ -97,7 +97,7 @@
    */
   public abstract class AbstractMarkupLanguage
           extends AbstractLogEnabled
  -        implements MarkupLanguage, Composable, Configurable, Parameterizable,
  +        implements MarkupLanguage, Serviceable, Configurable, Parameterizable,
                      Recyclable, Disposable
   {
       /** The 'file' URL protocol. */
  @@ -121,8 +121,8 @@
       /** The markup language's namespace prefix */
       protected String prefix;
   
  -    /** The component manager */
  -    protected ComponentManager manager;
  +    /** The service manager */
  +    protected ServiceManager manager;
   
       /** The URL factory source resolver used to resolve URIs */
       private SourceResolver resolver;
  @@ -217,10 +217,10 @@
       }
   
       /**
  -     * Set the global component manager.
  -     * @param manager The sitemap-specified component manager
  +     * Set the global service manager.
  +     * @param manager The sitemap-specified service manager
        */
  -    public void compose(ComponentManager manager) throws ComponentException {
  +    public void service(ServiceManager manager) throws ServiceException {
           this.manager = manager;
   
           // Initialize logicsheet cache
  
  
  
  1.9       +11 -12    cocoon-2.1/src/java/org/apache/cocoon/caching/impl/CacheImpl.java
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/caching/impl/CacheImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CacheImpl.java	11 Dec 2003 18:20:08 -0000	1.8
  +++ CacheImpl.java	7 Feb 2004 15:20:09 -0000	1.9
  @@ -54,13 +54,13 @@
   import java.io.Serializable;
   
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   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;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.Cache;
  @@ -79,19 +79,18 @@
    */
   public class CacheImpl
   extends AbstractLogEnabled
  -implements Cache, ThreadSafe, Composable, Disposable, Parameterizable {
  +implements Cache, ThreadSafe, Serviceable, Disposable, Parameterizable {
   
       /** The store containing the cached responses */
       protected Store store;
   
  -    /** The component manager */
  -    protected ComponentManager manager;
  +    /** The service manager */
  +    protected ServiceManager manager;
   
       /**
  -     * Composable Interface
  +     * Serviceable Interface
        */
  -    public void compose (ComponentManager manager)
  -    throws ComponentException {
  +    public void service (ServiceManager manager) throws ServiceException {
           this.manager = manager;
       }
   
  @@ -176,8 +175,8 @@
           String storeName = parameters.getParameter("store", Store.ROLE);
           try {
               this.store = (Store)this.manager.lookup(storeName);
  -        } catch (ComponentException ce) {
  -            throw new ParameterException("Unable to lookup store: " + storeName, ce);
  +        } catch (ServiceException e) {
  +            throw new ParameterException("Unable to lookup store: " + storeName, e);
           }
       }
   
  
  
  
  1.4       +17 -16    cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
  
  Index: JavaLanguage.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JavaLanguage.java	7 Oct 2003 15:13:20 -0000	1.3
  +++ JavaLanguage.java	7 Feb 2004 15:20:09 -0000	1.4
  @@ -50,29 +50,30 @@
   */
   package org.apache.cocoon.components.language.programming.java;
   
  +import java.io.File;
  +import java.io.IOException;
  +import java.util.List;
  +import java.util.StringTokenizer;
  +
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  +import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.service.ServiceException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.avalon.framework.logger.LogEnabled;
   
   import org.apache.cocoon.components.classloader.ClassLoaderManager;
   import org.apache.cocoon.components.language.LanguageException;
  -import org.apache.cocoon.components.language.programming.LanguageCompiler;
   import org.apache.cocoon.components.language.markup.xsp.XSLTExtension;
   import org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage;
   import org.apache.cocoon.components.language.programming.CompilerError;
  +import org.apache.cocoon.components.language.programming.LanguageCompiler;
   import org.apache.cocoon.util.ClassUtils;
   import org.apache.cocoon.util.JavaArchiveFilter;
   
  -import java.io.File;
  -import java.io.IOException;
  -import java.util.List;
  -import java.util.StringTokenizer;
  -
   /**
    * The Java programming language processor
    *
  @@ -80,13 +81,13 @@
    * @version CVS $Id$
    */
   public class JavaLanguage extends CompiledProgrammingLanguage
  -        implements Initializable, ThreadSafe, Composable, Disposable {
  +        implements Initializable, ThreadSafe, Serviceable, Disposable {
   
       /** The class loader */
       private ClassLoaderManager classLoaderManager;
   
  -    /** The component manager */
  -    protected ComponentManager manager = null;
  +    /** The service manager */
  +    protected ServiceManager manager = null;
   
       /** Classpath */
       private String classpath;
  @@ -130,13 +131,13 @@
       }
   
       /**
  -     * Set the global component manager. This methods initializes the class
  +     * Set the global service manager. This methods initializes the class
        * loader manager if it was not (successfully) specified in the language
        * parameters
        *
  -     * @param manager The global component manager
  +     * @param manager The global service manager
        */
  -    public void compose(ComponentManager manager) {
  +    public void service(ServiceManager manager) throws ServiceException {
           this.manager = manager;
           if (this.classLoaderManager == null) {
               try {
  
  
  

Mime
View raw message