cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/flow AbstractInterpreter.java

[cziegeler]

cziegeler    2003/10/30 04:41:19

  Modified:    src/java/org/apache/cocoon/components/flow
                        AbstractInterpreter.java
  Log:
  Updating environment handling
  
  Revision  Changes    Path
  1.13      +7 -7      
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AbstractInterpreter.java  22 Oct 2003 18:10:48 -0000      1.12
  +++ AbstractInterpreter.java  30 Oct 2003 12:41:19 -0000      1.13
  @@ -57,10 +57,10 @@
   import org.apache.avalon.framework.thread.SingleThreaded;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.Processor;
  -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;
  +import org.apache.cocoon.environment.EnvironmentHelper;
   import org.apache.cocoon.environment.wrapper.EnvironmentWrapper;
   import org.apache.excalibur.source.SourceUtil;
   
  @@ -197,8 +197,8 @@
           Map objectModel = env.getObjectModel();
           FlowHelper.setContextObject(objectModel, biz);
   
  -        // Attermpt to start processing the wrapper environment
  -        Object key = RequestLifecycleHelper.startProcessing(wrapper);
  +        // Attempt to start processing the wrapper environment
  +        Object key = EnvironmentHelper.startProcessing(wrapper);
   
           Processor processor = null;
           boolean result = false;
  @@ -207,7 +207,7 @@
               processor = (Processor)this.manager.lookup(Processor.ROLE);
   
               // Enter the environment
  -            RequestLifecycleHelper.enterEnvironment(wrapper, this.manager, 
processor);
  +            EnvironmentHelper.enterProcessor(processor, this.manager, 
wrapper);
   
               // 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
  -                RequestLifecycleHelper.leaveEnvironment();
  +                EnvironmentHelper.leaveProcessor();
               }
  -            RequestLifecycleHelper.endProcessing(wrapper, key);
  +            EnvironmentHelper.endProcessing(wrapper, key);
               this.manager.release(processor);
           }
       }