cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r154895 - cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
Date Tue, 22 Feb 2005 20:26:35 GMT
Author: cziegeler
Date: Tue Feb 22 12:26:34 2005
New Revision: 154895

URL: http://svn.apache.org/viewcvs?view=rev&rev=154895
Log:
Make it compilable

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java?view=diff&r1=154894&r2=154895
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Tue Feb 22 12:26:34 2005
@@ -42,15 +42,15 @@
 import org.apache.cocoon.Cocoon;
 import org.apache.cocoon.Constants;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.CocoonComponentManager;
+import org.apache.cocoon.Processor;
 import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.components.pipeline.ProcessingPipeline;
 import org.apache.cocoon.configuration.Settings;
 import org.apache.cocoon.core.Core;
 import org.apache.cocoon.environment.Environment;
 import org.apache.cocoon.environment.commandline.CommandLineContext;
 import org.apache.cocoon.environment.commandline.FileSavingEnvironment;
 import org.apache.cocoon.environment.commandline.LinkSamplingEnvironment;
+import org.apache.cocoon.environment.internal.EnvironmentHelper;
 import org.apache.cocoon.util.ClassUtils;
 import org.apache.cocoon.util.IOUtils;
 import org.apache.cocoon.util.NetUtils;
@@ -239,9 +239,8 @@
         File conf = new File(filename);
         if (conf.canRead()) {
             return conf;
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -529,11 +528,11 @@
                                       gatheredLinks, cliContext, null, log);
 
         XMLConsumer consumer = new ContentHandlerWrapper(handler);
-        ProcessingPipeline pipeline = cocoon.buildPipeline(env);
-        CocoonComponentManager.enterEnvironment(env, cocoon.getComponentManager(), cocoon);
-        pipeline.prepareInternal(env);
-        CocoonComponentManager.leaveEnvironment();
-        pipeline.process(env, consumer);
+        Processor.InternalPipelineDescription pipeline = cocoon.buildPipeline(env);
+        EnvironmentHelper.enterProcessor(pipeline.lastProcessor, getServiceManager(), env);
+        pipeline.processingPipeline.prepareInternal(env);
+        EnvironmentHelper.leaveProcessor();
+        pipeline.processingPipeline.process(env, consumer);
 
         // if we get here, the page was created :-)
         int status = env.getStatus();



Mime
View raw message