cvs commit: cocoon-2.2/src/java/org/apache/cocoon/environment/internal EnvironmentHelper.java

[sylvain]

sylvain     2004/02/20 10:58:59

  Modified:    src/java/org/apache/cocoon/environment/internal
                        EnvironmentHelper.java
  Log:
  Updates after flowscript upgrade
  
  Revision  Changes    Path
  1.9       +1 -27     
cocoon-2.2/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java
  
  Index: EnvironmentHelper.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EnvironmentHelper.java    20 Feb 2004 18:57:15 -0000      1.8
  +++ EnvironmentHelper.java    20 Feb 2004 18:58:59 -0000      1.9
  @@ -399,17 +399,6 @@
           }
           stack.pushInfo(new EnvironmentInfo(processor, stack.getOffset(), 
manager, env));
           stack.setOffset(stack.size()-1);
  -<<<<<<< EnvironmentHelper.java
  -=======
  -        
  -        // TODO: THIS WILL BE REMOVED SOON
  -        EnvironmentContext ctx = 
(EnvironmentContext)env.getObjectModel().get(PROCESS_KEY);
  -        
  -        ForwardRedirector redirector = new ForwardRedirector(env);
  -        
redirector.enableLogging(processor.getEnvironmentHelper().getLogger());
  -        ctx.addAttribute(REDIRECTOR_KEY, redirector);
  ->>>>>>> 1.7
  -
       }
   
       /**
  @@ -469,21 +458,6 @@
       }
       
       /**
  -<<<<<<< EnvironmentHelper.java
  -=======
  -     * Return the Redirector
  -     * TODO: THIS WILL BE REMOVED SOON
  -     */
  -    public static Redirector getRedirector(Environment env) {
  -        final EnvironmentContext ctx = getEnvironmentContext(env);
  -        if (ctx != null) {
  -            return (Redirector) ctx.getAttribute(REDIRECTOR_KEY);
  -        }
  -        return null;
  -    }
  -    
  -    /**
  ->>>>>>> 1.7
        * Return the environment context
        * TODO: THIS WILL BE REMOVED SOON
        */