cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/flow AbstractInterpreter.java Interpreter.java
Date Wed, 22 Oct 2003 18:10:48 GMT
bloritsch    2003/10/22 11:10:48

  Modified:    src/java/org/apache/cocoon/components/flow
                        AbstractInterpreter.java Interpreter.java
  Log:
  Update the script stuff to be resettable/serviceable
  
  Revision  Changes    Path
  1.12      +9 -9      cocoon-2.2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
  
  Index: AbstractInterpreter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractInterpreter.java	16 Oct 2003 14:57:36 -0000	1.11
  +++ AbstractInterpreter.java	22 Oct 2003 18:10:48 -0000	1.12
  @@ -51,13 +51,13 @@
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.thread.SingleThreaded;
  -import org.apache.avalon.framework.service.Serviceable;
  -import org.apache.avalon.framework.service.ServiceManager;
   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.SingleThreaded;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.Processor;
  -import org.apache.cocoon.components.CocoonComponentManager;
  +import org.apache.cocoon.components.RequestLifecycleHelper;
   import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
   import org.apache.cocoon.environment.Context;
   import org.apache.cocoon.environment.Environment;
  @@ -198,7 +198,7 @@
           FlowHelper.setContextObject(objectModel, biz);
   
           // Attermpt to start processing the wrapper environment
  -        Object key = CocoonComponentManager.startProcessing(wrapper);
  +        Object key = RequestLifecycleHelper.startProcessing(wrapper);
   
           Processor processor = null;
           boolean result = false;
  @@ -207,7 +207,7 @@
               processor = (Processor)this.manager.lookup(Processor.ROLE);
   
               // Enter the environment
  -            CocoonComponentManager.enterEnvironment(wrapper, this.manager, processor);
  +            RequestLifecycleHelper.enterEnvironment(wrapper, this.manager, processor);
   
               // Process the subrequest
               result = processor.process(wrapper);
  @@ -223,9 +223,9 @@
               if ( processor != null ) {
                   // enterEnvironemnt has only been called if the
                   // processor has been looked up
  -                CocoonComponentManager.leaveEnvironment();
  +                RequestLifecycleHelper.leaveEnvironment();
               }
  -            CocoonComponentManager.endProcessing(wrapper, key);
  +            RequestLifecycleHelper.endProcessing(wrapper, key);
               this.manager.release(processor);
           }
       }
  
  
  
  1.4       +2 -3      cocoon-2.2/src/java/org/apache/cocoon/components/flow/Interpreter.java
  
  Index: Interpreter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/Interpreter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Interpreter.java	7 May 2003 04:36:33 -0000	1.3
  +++ Interpreter.java	22 Oct 2003 18:10:48 -0000	1.4
  @@ -108,7 +108,6 @@
    *
    * @author <a href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</a>
    * @since March 11, 2002
  - * @see InterpreterSelector
    * @version CVS $Id$
    */
   public interface Interpreter
  @@ -180,7 +179,7 @@
     /**
      * Forward the request to a Cocoon pipeline.
      *
  -   * @param URI a <code>String</code>, the URI of the forwarded request
  +   * @param uri a <code>String</code>, the URI of the forwarded request
      * @param bizData an <code>Object</code>, the business data object
      * to be made available to the forwarded pipeline
      * @param continuation a <code>WebContinuation</code>, the
  
  
  

Mime
View raw message