Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 98741 invoked from network); 19 Oct 2007 02:00:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Oct 2007 02:00:25 -0000 Received: (qmail 81926 invoked by uid 500); 19 Oct 2007 02:00:13 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 81843 invoked by uid 500); 19 Oct 2007 02:00:12 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 81832 invoked by uid 99); 19 Oct 2007 02:00:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2007 19:00:12 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Oct 2007 02:00:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 20CF81A9832; Thu, 18 Oct 2007 18:59:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r586224 - in /cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java: AbstractContinuable.java CocoonContinuationContext.java Date: Fri, 19 Oct 2007 01:59:33 -0000 To: cvs@cocoon.apache.org From: vgritsenko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071019015934.20CF81A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vgritsenko Date: Thu Oct 18 18:59:33 2007 New Revision: 586224 URL: http://svn.apache.org/viewvc?rev=586224&view=rev Log: switching to new AbstractLogEnabled Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/CocoonContinuationContext.java Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java?rev=586224&r1=586223&r2=586224&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java (original) +++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java Thu Oct 18 18:59:33 2007 @@ -20,22 +20,23 @@ import java.util.Map; import org.apache.avalon.framework.CascadingRuntimeException; -import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.commons.javaflow.Continuation; +import org.apache.excalibur.source.SourceUtil; + import org.apache.cocoon.components.ContextHelper; import org.apache.cocoon.components.flow.FlowHelper; import org.apache.cocoon.components.flow.util.PipelineUtil; -import org.apache.cocoon.environment.Request; import org.apache.cocoon.el.objectmodel.ObjectModel; -import org.apache.commons.javaflow.Continuation; -import org.apache.excalibur.source.SourceUtil; +import org.apache.cocoon.environment.Request; +import org.apache.cocoon.util.AbstractLogEnabled; /** * Abstract class to add basic methods for flow handling. * * @version $Id$ */ -public abstract class AbstractContinuable { +public abstract class AbstractContinuable extends AbstractLogEnabled { protected CocoonContinuationContext getContext() { Object context = Continuation.getContext(); @@ -47,11 +48,6 @@ } - public Logger getLogger() { - return getContext().getLogger(); - } - - public void sendPageAndWait( String uri ) { sendPageAndWait(uri, new VarMap()); } @@ -59,8 +55,10 @@ public void sendPageAndWait( String uri, Object bizdata ) { CocoonContinuationContext context = getContext(); - if (context.getLogger() != null) - context.getLogger().debug("send page and wait '" + uri + "'"); + if (getLogger() != null) { + getLogger().debug("send page and wait '" + uri + "'"); + } + ObjectModel newObjectModel = (ObjectModel)getComponent(ObjectModel.ROLE); FlowHelper.setContextObject(ContextHelper.getObjectModel(context.getAvalonContext()), newObjectModel, bizdata); @@ -92,8 +90,8 @@ public void sendPage( String uri, Object bizdata ) { CocoonContinuationContext context = getContext(); - if (context.getLogger() != null) { - context.getLogger().debug("send page '" + uri + "'"); + if (getLogger() != null) { + getLogger().debug("send page '" + uri + "'"); } ObjectModel newObjectModel = (ObjectModel)getComponent(ObjectModel.ROLE); Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/CocoonContinuationContext.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/CocoonContinuationContext.java?rev=586224&r1=586223&r2=586224&view=diff ============================================================================== --- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/CocoonContinuationContext.java (original) +++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/CocoonContinuationContext.java Thu Oct 18 18:59:33 2007 @@ -48,6 +48,7 @@ this.logger = logger; } + /** @deprecated Use commons logging */ public Logger getLogger() { return logger; }