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

2003-10-30 Thread cziegeler 
cziegeler2003/10/30 04:41:19

  Modified:src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
  Log:
  Updating environment handling
  
  Revision  ChangesPath
  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 -  1.12
  +++ AbstractInterpreter.java  30 Oct 2003 12:41:19 -  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);
   }
   }

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

2003-10-22 Thread bloritsch 
bloritsch2003/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  ChangesPath
  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 -  1.11
  +++ AbstractInterpreter.java  22 Oct 2003 18:10:48 -  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 -   1.3
  +++ Interpreter.java  22 Oct 2003 18:10:48 -  1.4
  @@ -108,7 +108,6 @@
*
* @author a href=mailto:[EMAIL PROTECTED]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 codeString/code, the URI of the forwarded request
  +   * @param uri a codeString/code, the URI of the forwarded request
  * @param bizData an codeObject/code, the business data object
  * to be made available to the forwarded pipeline
  * @param continuation a codeWebContinuation/code, the

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

2003-10-16 Thread bloritsch 
bloritsch2003/10/16 07:57:36

  Modified:src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_Cocoon.java FOM_WebContinuation.java
   src/java/org/apache/cocoon/components/flow/javascript
JSCocoon.java JSWebContinuation.java
   src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
  Log:
  Update to Serviceable contracts
  
  Revision  ChangesPath
  1.14  +83 -84
cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
  
  Index: FOM_Cocoon.java
  ===
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- FOM_Cocoon.java   15 Oct 2003 17:04:50 -  1.13
  +++ FOM_Cocoon.java   16 Oct 2003 14:57:36 -  1.14
  @@ -59,9 +59,8 @@
   import java.util.Locale;
   import java.util.Map;
   
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.logger.Logger;
  +import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.components.flow.ContinuationsManager;
   import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.flow.Interpreter.Argument;
  @@ -82,7 +81,7 @@
   /**
* Implementation of FOM (Flow Object Model).
*
  - * @since 2.1 
  + * @since 2.1
* @author a href=mailto:coliver.at.apache.org;Christopher Oliver/a
* @author a href=mailto:reinhard.at.apache.org;Reinhard Pötz/a
* @version CVS $Id$
  @@ -93,7 +92,7 @@
   private FOM_JavaScriptInterpreter interpreter;
   
   private Environment environment;
  -private ComponentManager componentManager;
  +private ServiceManager serviceManager;
   private Logger logger;
   
   private FOM_Request request;
  @@ -122,19 +121,19 @@
   }
   
   void setup(FOM_JavaScriptInterpreter interp,
  -   Environment env, 
  -   ComponentManager manager,
  -   Logger logger) {
  +  Environment env,
  +  ServiceManager manager,
  +  Logger logger) {
   this.interpreter = interp;
   this.environment = env;
  -this.componentManager = manager;
  +this.serviceManager = manager;
   this.logger = logger;
   }
   
   void invalidate() {
   // Clear the scope attribute
   
this.getRequest().removeAttribute(FOM_JavaScriptFlowHelper.FOM_SCOPE);
  -
  +
   // Cleanup everything
   this.request = null;
   this.response = null;
  @@ -142,32 +141,32 @@
   this.context = null;
   this.log = null;
   this.logger = null;
  -this.componentManager = null;
  +this.serviceManager = null;
   this.environment = null;
   this.interpreter = null;
   }
   
   
   private FOM_WebContinuation forwardTo(String uri, Object bizData,
  -  Continuation continuation) 
  +  Continuation continuation)
   throws Exception {
   WebContinuation wk = null;
   if (continuation != null) {
   ContinuationsManager contMgr = (ContinuationsManager)
  -componentManager.lookup(ContinuationsManager.ROLE);
  -wk = lastContinuation = 
  +serviceManager.lookup(ContinuationsManager.ROLE);
  +wk = lastContinuation =
   contMgr.createWebContinuation(continuation,
 lastContinuation,
 0,
 null);
   }
  -
  +
   String redUri = uri;
  -
  +
   FOM_WebContinuation fom_wk =
   new FOM_WebContinuation(wk);
   fom_wk.setParentScope(getParentScope());
  -fom_wk.setPrototype(getClassPrototype(getParentScope(), 
  +fom_wk.setPrototype(getClassPrototype(getParentScope(),
 fom_wk.getClassName()));
   interpreter.forwardTo(getParentScope(), this, redUri,
 bizData, fom_wk, environment);
  @@ -182,23 +181,23 @@
   return result;
   }
   
  -public FOM_WebContinuation jsFunction_sendPage(String uri, 
  -   Object obj, 
  -   Object continuation) 
  +public FOM_WebContinuation jsFunction_sendPage(String uri,
  +   Object obj,
  +