You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/12/28 22:09:59 UTC

cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom FOM_Cocoon.java

unico       2003/12/28 13:09:59

  Modified:    src/java/org/apache/cocoon/components/flow/javascript
                        JSCocoon.java
               src/java/org/apache/cocoon/transformation
                        I18nTransformer.java
               src/java/org/apache/cocoon/environment
                        ForwardRedirector.java
               src/java/org/apache/cocoon/components/flow
                        AbstractInterpreter.java
               src/java/org/apache/cocoon/components/flow/javascript/fom
                        FOM_Cocoon.java
  Log:
  moving of package treeprocessor to cprocessor reveals some questionable dependencies on the processor implementation
  
  Revision  Changes    Path
  1.14      +2 -2      cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/JSCocoon.java
  
  Index: JSCocoon.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/JSCocoon.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JSCocoon.java	28 Oct 2003 17:21:14 -0000	1.13
  +++ JSCocoon.java	28 Dec 2003 21:09:59 -0000	1.14
  @@ -70,7 +70,7 @@
   import org.apache.cocoon.components.modules.output.OutputModule;
   import org.apache.cocoon.components.modules.input.InputModule;
   import org.apache.cocoon.components.CocoonComponentManager;
  -import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
  +import org.apache.cocoon.components.cprocessor.sitemap.PipelinesNode;
   import org.apache.cocoon.components.flow.ContinuationsManager;
   import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.acting.Action;
  
  
  
  1.18      +2 -2      cocoon-2.2/src/java/org/apache/cocoon/transformation/I18nTransformer.java
  
  Index: I18nTransformer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- I18nTransformer.java	25 Dec 2003 13:56:38 -0000	1.17
  +++ I18nTransformer.java	28 Dec 2003 21:09:59 -0000	1.18
  @@ -79,7 +79,7 @@
   import org.apache.avalon.framework.service.Serviceable;
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
  -import org.apache.cocoon.components.treeprocessor.variables.PreparedVariableResolver;
  +import org.apache.cocoon.components.cprocessor.variables.PreparedVariableResolver;
   import org.apache.cocoon.environment.SourceResolver;
   import org.apache.cocoon.i18n.Bundle;
   import org.apache.cocoon.i18n.BundleFactory;
  
  
  
  1.14      +2 -2      cocoon-2.2/src/java/org/apache/cocoon/environment/ForwardRedirector.java
  
  Index: ForwardRedirector.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/ForwardRedirector.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ForwardRedirector.java	16 Nov 2003 23:17:10 -0000	1.13
  +++ ForwardRedirector.java	28 Dec 2003 21:09:59 -0000	1.14
  @@ -54,7 +54,7 @@
   
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.components.treeprocessor.TreeProcessor;
  +import org.apache.cocoon.components.cprocessor.TreeProcessor;
   
   /**
    * A <code>Redirector</code> that handles forward redirects, i.e. internal
  
  
  
  1.14      +2 -2      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractInterpreter.java	30 Oct 2003 12:41:19 -0000	1.13
  +++ AbstractInterpreter.java	28 Dec 2003 21:09:59 -0000	1.14
  @@ -57,7 +57,7 @@
   import org.apache.avalon.framework.thread.SingleThreaded;
   import org.apache.cocoon.Constants;
   import org.apache.cocoon.Processor;
  -import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
  +import org.apache.cocoon.components.cprocessor.sitemap.PipelinesNode;
   import org.apache.cocoon.environment.Context;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.EnvironmentHelper;
  
  
  
  1.18      +2 -2      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- FOM_Cocoon.java	16 Nov 2003 23:20:27 -0000	1.17
  +++ FOM_Cocoon.java	28 Dec 2003 21:09:59 -0000	1.18
  @@ -61,10 +61,10 @@
   
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.cocoon.components.cprocessor.sitemap.PipelinesNode;
   import org.apache.cocoon.components.flow.ContinuationsManager;
   import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.flow.Interpreter.Argument;
  -import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
   import org.apache.cocoon.environment.Cookie;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.environment.ObjectModelHelper;