cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
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 GMT
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;
     }



Mime
View raw message