cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r440049 - in /cocoon/trunk: blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/ blocks/cocoon-portal/co...
Date Mon, 04 Sep 2006 12:25:41 GMT
Author: cziegeler
Date: Mon Sep  4 05:25:39 2006
New Revision: 440049

URL: http://svn.apache.org/viewvc?view=rev&rev=440049
Log:
No more usage of Avalon's LogEnabled and Contextualizable

Added:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractLogEnabled.java   (with props)
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java   (with props)
Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/NewPageLabelEventConverter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/deployment/Deployer.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/GroupSessionImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletSessionImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/SessionHandlerImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLRewriterImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/UserSessionImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonLoggerFactoryBean.java

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java Mon Sep  4 05:25:39 2006
@@ -17,7 +17,6 @@
 
 import java.util.StringTokenizer;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
@@ -29,6 +28,7 @@
 import org.apache.cocoon.portal.event.EventManager;
 import org.apache.cocoon.portal.event.aspect.EventAspect;
 import org.apache.cocoon.portal.event.aspect.EventAspectContext;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.om.Layout;
 
 /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java Mon Sep  4 05:25:39 2006
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.portal.event.aspect.impl;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
@@ -25,6 +24,7 @@
 import org.apache.cocoon.environment.Response;
 import org.apache.cocoon.portal.event.aspect.EventAspect;
 import org.apache.cocoon.portal.event.aspect.EventAspectContext;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 
 /**
  * This aspect "disables" the back button of the browser and tries to avoid

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java Mon Sep  4 05:25:39 2006
@@ -15,12 +15,12 @@
  */
 package org.apache.cocoon.portal.event.aspect.impl;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Response;
 import org.apache.cocoon.portal.event.aspect.EventAspect;
 import org.apache.cocoon.portal.event.aspect.EventAspectContext;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 
 /**
  * This aspect implementation sets some headers on the response that tell

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java Mon Sep  4 05:25:39 2006
@@ -17,7 +17,6 @@
 
 import java.util.Iterator;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.service.Serviceable;
@@ -25,6 +24,7 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.impl.PageLabelManager;
 import org.apache.cocoon.portal.event.Event;
 import org.apache.cocoon.portal.event.EventManager;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java Mon Sep  4 05:25:39 2006
@@ -18,7 +18,6 @@
 import java.util.StringTokenizer;
 import java.util.List;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
@@ -26,6 +25,7 @@
 import org.apache.cocoon.portal.event.EventManager;
 import org.apache.cocoon.portal.event.aspect.EventAspect;
 import org.apache.cocoon.portal.event.aspect.EventAspectContext;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.services.LinkService;
 
 /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/NewPageLabelEventConverter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/NewPageLabelEventConverter.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/NewPageLabelEventConverter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/NewPageLabelEventConverter.java Mon Sep  4 05:25:39 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.cocoon.portal.event.impl;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.portal.event.Event;
 import org.apache.cocoon.portal.event.EventConverter;
 import org.apache.cocoon.portal.event.layout.ChangeTabEvent;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.om.Item;
 import org.apache.cocoon.portal.om.Layout;
 import org.apache.cocoon.portal.om.NamedItem;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java Mon Sep  4 05:25:39 2006
@@ -19,11 +19,11 @@
 import java.util.Map;
 import java.util.ArrayList;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.impl.PageLabelManager;
 import org.apache.cocoon.portal.event.Event;
 import org.apache.cocoon.portal.event.EventConverter;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractComponent.java Mon Sep  4 05:25:39 2006
@@ -17,10 +17,6 @@
 
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
@@ -37,23 +33,13 @@
  */
 public class AbstractComponent
     extends AbstractLogEnabled
-    implements Contextualizable, Serviceable, Disposable, ThreadSafe, Initializable {
+    implements Serviceable, Disposable, ThreadSafe, Initializable {
     
     /** The service manager. */
     protected ServiceManager manager;
 
     /** The portal service. */
     protected PortalService portalService;
-
-    /** The application context */
-    protected Context context;
-
-    /**
-     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
-     */
-    public void contextualize(Context aContext) throws ContextException {
-        this.context = aContext;
-    }
 
     /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)

Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractLogEnabled.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractLogEnabled.java?view=auto&rev=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractLogEnabled.java (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractLogEnabled.java Mon Sep  4 05:25:39 2006
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.portal.impl;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * Support for logging.
+ *
+ * @version $Id$
+ */
+public abstract class AbstractLogEnabled {
+
+    /** By default we use the logger for this class. */
+    private Log logger = LogFactory.getLog(getClass());
+
+    public Log getLogger() {
+        return this.logger;
+    }
+
+    public void setLogger(Log l) {
+        this.logger = l;
+    }
+}

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractLogEnabled.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/AbstractLogEnabled.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Mon Sep  4 05:25:39 2006
@@ -29,15 +29,10 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.Constants;
 import org.apache.cocoon.portal.PortalManager;
 import org.apache.cocoon.portal.PortalRuntimeException;
 import org.apache.cocoon.portal.PortalService;
@@ -55,6 +50,7 @@
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 import org.apache.excalibur.source.TraversableSource;
+import org.springframework.web.context.ServletContextAware;
 
 /**
  * Default implementation of a portal service using a session to store
@@ -67,15 +63,15 @@
     implements Serviceable,
                 ThreadSafe, 
                 PortalService, 
-                Contextualizable,
+                ServletContextAware,
                 Disposable,
                 Configurable {
 
     /** Parameter map for the context protocol. */
     protected static final Map CONTEXT_PARAMETERS = Collections.singletonMap("force-traversable", Boolean.TRUE);
 
-    /** The component context. */
-    protected Context context;
+    /** The servlet context. */
+    protected ServletContext servletContext;
 
     /** The service locator. */
     protected ServiceManager manager;
@@ -135,20 +131,12 @@
     }
 
     /**
-     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
+     * @see org.springframework.web.context.ServletContextAware#setServletContext(javax.servlet.ServletContext)
      */
-    public void contextualize(Context aContext) throws ContextException {
-        this.context = aContext;
-        // add the portal service to the servlet context - if available
-        try {
-            final ServletContext servletContext = (ServletContext)aContext.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
-            servletContext.setAttribute(PortalService.ROLE, this);
-        } catch (ContextException ignore) {
-            // we ignore the context exception
-            // this avoids startup errors if the portal is configured for the CLI
-            // environment
-            this.getLogger().warn("The portal service is not stored in the servlet config.", ignore);
-        }
+    public void setServletContext(ServletContext context) {
+        this.servletContext = context;
+        // add the portal service to the servlet context
+        this.servletContext.setAttribute(PortalService.ROLE, this);
     }
 
     /**
@@ -156,13 +144,8 @@
      */
     public void dispose() {
         // remove the portal service from the servlet context - if available
-        if ( this.context != null ) {
-            try {
-                final ServletContext servletContext = (ServletContext)this.context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
-                servletContext.removeAttribute(PortalService.ROLE);
-            } catch (ContextException ignore) {
-                // we ignore the context exception
-            }
+        if ( this.servletContext != null ) {
+            this.servletContext.removeAttribute(PortalService.ROLE);
         }
         if ( this.manager != null ) {
             this.renderers.clear();

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java Mon Sep  4 05:25:39 2006
@@ -19,13 +19,13 @@
 import javax.xml.transform.sax.TransformerHandler;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.portal.LayoutException;
 import org.apache.cocoon.portal.PortalService;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.layout.renderer.Renderer;
 import org.apache.cocoon.portal.om.Layout;
 import org.apache.cocoon.xml.IncludeXMLConsumer;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java Mon Sep  4 05:25:39 2006
@@ -19,13 +19,13 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.portal.LayoutException;
 import org.apache.cocoon.portal.PortalService;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.layout.renderer.Renderer;
 import org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultRendererContext;
 import org.apache.cocoon.portal.layout.renderer.aspect.impl.RendererAspectChain;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/persistence/castor/CastorSourceConverter.java Mon Sep  4 05:25:39 2006
@@ -30,12 +30,12 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.persistence.Converter;
 import org.apache.cocoon.portal.persistence.ConverterException;
 import org.apache.cocoon.portal.profile.ProfileLS;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java Mon Sep  4 05:25:39 2006
@@ -24,11 +24,11 @@
 import java.util.Map.Entry;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.persistence.Converter;
 import org.apache.cocoon.portal.profile.ProfileLS;
 import org.apache.cocoon.util.NetUtils;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java Mon Sep  4 05:25:39 2006
@@ -19,9 +19,9 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.om.CopletInstance;
 import org.apache.cocoon.portal.om.CopletInstanceFeatures;
 import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletContainerEnvironmentImpl.java Mon Sep  4 05:25:39 2006
@@ -22,15 +22,13 @@
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.pluto.om.PortletDefinitionRegistry;
 import org.apache.cocoon.portal.pluto.om.PortletDefinitionRegistryImpl;
 import org.apache.cocoon.portal.pluto.service.log.LogServiceImpl;
@@ -51,12 +49,11 @@
  * @version $Id$
  */
 public class PortletContainerEnvironmentImpl 
-extends AbstractLogEnabled
+    extends AbstractLogEnabled
     implements PortletContainerEnvironment,
                Serviceable,
                Disposable,
                Initializable,
-               Contextualizable,
                Parameterizable {
 
     /** The service manager. */
@@ -68,9 +65,6 @@
     /** Static services. */
     protected Map staticServices = new HashMap();
     
-    /** Context. */
-    protected Context context;
-    
     /** Configuration. */
     protected Parameters parameters;
 
@@ -90,13 +84,6 @@
     }
     
     /**
-     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
-     */
-    public void contextualize(Context avalonContext) {
-        this.context = avalonContext;        
-    }
-    
-    /**
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
     public void initialize() throws Exception {
@@ -121,8 +108,9 @@
      */
     protected Object init(Object o) 
     throws Exception {
-        ContainerUtil.enableLogging(o, this.getLogger());
-        ContainerUtil.contextualize(o, this.context);
+        if ( o instanceof AbstractLogEnabled ) {
+            ((AbstractLogEnabled)o).setLogger(this.getLogger());
+        }
         ContainerUtil.parameterize(o, this.parameters);
         ContainerUtil.service(o, this.manager);
         if ( o instanceof PortletContainerEnabled ) {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Mon Sep  4 05:25:39 2006
@@ -283,8 +283,7 @@
             final String uniqueContainerName = "cocoon-portal";
 
             this.portletContainerEnvironment = new PortletContainerEnvironmentImpl();
-            ContainerUtil.enableLogging(this.portletContainerEnvironment, this.getLogger());
-            ContainerUtil.contextualize(this.portletContainerEnvironment, this.context);
+            this.portletContainerEnvironment.setLogger(this.getLogger());
             ContainerUtil.parameterize(this.portletContainerEnvironment, this.parameters);
             ContainerUtil.service(this.portletContainerEnvironment, this.manager);
             ContainerUtil.initialize(this.portletContainerEnvironment);

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/deployment/Deployer.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/deployment/Deployer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/deployment/Deployer.java Mon Sep  4 05:25:39 2006
@@ -29,12 +29,12 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.CascadingIOException;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.portal.deployment.DeploymentException;
 import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.logging.Log;
 import org.apache.excalibur.source.Source;
 import org.w3c.dom.Document;
 import org.xml.sax.EntityResolver;
@@ -48,10 +48,10 @@
  */
 public class Deployer {
 
-    public static boolean deploy(Source inputSource,
-                                 String outputName,
+    public static boolean deploy(Source  inputSource,
+                                 String  outputName,
                                  boolean stripLoggers,
-                                 Logger logger,
+                                 Log     logger,
                                  ServiceManager manager)
     throws DeploymentException, IOException, SAXException, ProcessingException {
         // first test, if the portlet is already deployed

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java Mon Sep  4 05:25:39 2006
@@ -18,7 +18,7 @@
 import java.util.Map;
 import javax.servlet.ServletConfig;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.pluto.factory.Factory;
 
 /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java Mon Sep  4 05:25:39 2006
@@ -30,13 +30,10 @@
 
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.util.ClassUtils;
 import org.apache.pluto.factory.PortletObjectAccess;
 import org.apache.pluto.invoker.PortletInvoker;
@@ -49,7 +46,7 @@
  */
 public class LocalPortletInvokerImpl
 extends AbstractLogEnabled
-implements PortletInvoker, Contextualizable, Serviceable, Initializable {
+implements PortletInvoker, Serviceable, Initializable {
 
     /** servlet configuration. */
     protected final ServletConfig servletConfig;
@@ -60,20 +57,10 @@
     /** The portlet. */
     protected Portlet portlet;
 
-    /** The avalon context. */
-    protected Context context;
-
     /** The service manager. */
     protected ServiceManager manager;
 
     /**
-     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
-     */
-    public void contextualize(Context avalonContext) throws ContextException {
-        this.context = avalonContext;
-    }
-
-    /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager serviceManager) throws ServiceException {
@@ -86,8 +73,9 @@
     public void initialize() throws Exception {
         if (this.portlet != null) {
             try {
-                ContainerUtil.enableLogging(this.portlet, this.getLogger());
-                ContainerUtil.contextualize(this.portlet, this.context);
+                if ( this.portlet instanceof AbstractLogEnabled ) {
+                    ((AbstractLogEnabled)this.portlet).setLogger(this.getLogger());
+                }
                 ContainerUtil.service(this.portlet, this.manager);
                 ContainerUtil.initialize(this.portlet);
             } catch (Exception ignore) {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java Mon Sep  4 05:25:39 2006
@@ -22,13 +22,11 @@
 
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.pluto.om.PortletDefinitionImpl;
 import org.apache.pluto.factory.PortletInvokerFactory;
 import org.apache.pluto.invoker.PortletInvoker;
@@ -41,10 +39,7 @@
  */
 public class PortletInvokerFactoryImpl 
 extends AbstractFactory
-implements PortletInvokerFactory, Serviceable, Contextualizable, ThreadSafe, Disposable {
-
-    /** The avalon context */
-    protected Context context;
+implements PortletInvokerFactory, Serviceable, ThreadSafe, Disposable {
 
     /** The service manager */
     protected ServiceManager manager;
@@ -53,13 +48,6 @@
     protected List localPortlets = Collections.synchronizedList(new ArrayList());
 
     /**
-     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
-     */
-    public void contextualize(Context avalonContext) throws ContextException {
-        this.context = avalonContext;
-    }
-
-    /**
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
     public void service(ServiceManager serviceManager) throws ServiceException {
@@ -77,7 +65,6 @@
         }
         this.localPortlets.clear();
         this.manager = null;
-        this.context = null;
     }
 
     /**
@@ -97,8 +84,9 @@
                 this.localPortlets.add(invoker);
                 ((PortletDefinitionImpl)portletDefinition).setLocalPortletInvoker(invoker);
                 try {
-                    ContainerUtil.enableLogging(invoker, this.getLogger());
-                    ContainerUtil.contextualize(invoker, this.context);
+                    if ( invoker instanceof AbstractLogEnabled ) {
+                        ((AbstractLogEnabled)invoker).setLogger(this.getLogger());
+                    }
                     ContainerUtil.service(invoker, this.manager);
                     ContainerUtil.initialize(invoker);
                 } catch (Exception ignore) {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java Mon Sep  4 05:25:39 2006
@@ -36,7 +36,6 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.Constants;
 import org.apache.cocoon.components.source.SourceUtil;
 import org.apache.cocoon.components.thread.RunnableManager;
 import org.apache.cocoon.portal.PortalService;
@@ -182,7 +181,7 @@
         }
         super.initialize();
 
-        this.servletContext = (ServletContext)context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
+        this.servletContext = this.portalService.getProcessInfoProvider().getServletContext();
 
         // get our context path
         String baseWMDir = this.servletContext.getRealPath("");

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java Mon Sep  4 05:25:39 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.cocoon.portal.pluto.service.log;
 
+import org.apache.commons.logging.Log;
 import org.apache.pluto.services.log.LogService;
 import org.apache.pluto.services.log.Logger;
 
@@ -30,7 +31,7 @@
     protected Logger logger;
 
     /** Constructor */
-    public LogServiceImpl(org.apache.avalon.framework.logger.Logger logger) {
+    public LogServiceImpl(Log logger) {
         this.logger = new LoggerImpl(logger);
     }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java Mon Sep  4 05:25:39 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.pluto.service.log;
 
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
 
 /**
  * Our own log service logging to an avalon logger.
@@ -26,10 +26,10 @@
 implements org.apache.pluto.services.log.Logger {
 
     /** The logger to use */
-    protected Logger logger;
+    protected Log logger;
 
     /** Constructor */
-    public LoggerImpl(Logger logger) {
+    public LoggerImpl(Log logger) {
         this.logger = logger;
     }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java Mon Sep  4 05:25:39 2006
@@ -37,13 +37,11 @@
 import javax.servlet.ServletContext;
 
 import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.Constants;
 import org.apache.cocoon.portal.impl.AbstractComponent;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.pluto.factory.ActionRequestFactoryImpl;
 import org.apache.cocoon.portal.pluto.factory.ControllerFactoryImpl;
 import org.apache.cocoon.portal.pluto.factory.ObjectIDFactoryImpl;
@@ -90,15 +88,6 @@
     /** The configuration. */
     protected Parameters parameters;
 
-    /**<
-     * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
-     */
-    public void contextualize(Context aContext) throws ContextException {
-        super.contextualize(aContext);
-        final ServletContext servletContext = (ServletContext)aContext.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
-        this.servletConfig = new PortalServletConfig(servletContext);
-    }
-
     protected static final class PortalServletConfig implements ServletConfig {
 
         private final ServletContext servletContext;
@@ -149,6 +138,8 @@
     public void initialize()
     throws Exception {
         super.initialize();
+        final ServletContext servletContext = this.portalService.getProcessInfoProvider().getServletContext();
+        this.servletConfig = new PortalServletConfig(servletContext);
         final Map factories = new HashMap();
 
         factories.put(ActionRequest.class.getName(), 
@@ -189,8 +180,9 @@
             // try to get hold of the factory
             Factory factory = (Factory) ClassUtils.newInstance((String)me.getValue());
 
-            ContainerUtil.enableLogging(factory, this.getLogger());
-            ContainerUtil.contextualize(factory, this.context);
+            if ( factory instanceof AbstractLogEnabled ) {
+                ((AbstractLogEnabled)factory).setLogger(this.getLogger());
+            }
             ContainerUtil.parameterize(factory, this.parameters);
             ContainerUtil.service(factory, this.manager);
             ContainerUtil.initialize(factory);

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java Mon Sep  4 05:25:39 2006
@@ -34,11 +34,11 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.components.cron.CronJob;
 import org.apache.cocoon.components.cron.JobScheduler;
 import org.apache.cocoon.components.cron.ServiceableCronJob;
 import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.Session;
 import org.apache.cocoon.portal.PortalException;
@@ -149,7 +149,7 @@
      */
     public void inform(ContentStoreEvent event, PortalService service) {
         // dispatch
-        final Session session = ContextHelper.getRequest(this.context).getSession();
+        final Session session = ObjectModelHelper.getRequest(service.getProcessInfoProvider().getObjectModel()).getSession();
         if ( event instanceof AddItemEvent ) {
 
             this.processAddItemEvent((AddItemEvent)event);
@@ -192,7 +192,7 @@
      */
     protected void processUploadItemEvent(UploadItemEvent event) {
         final ContentStore store = event.getContentStore();
-        final Request req = ContextHelper.getRequest(this.context);
+        final Request req = ObjectModelHelper.getRequest(this.portalService.getProcessInfoProvider().getObjectModel());
         final List paramNames = event.getItemNames();
         final Iterator i = paramNames.iterator();
         while ( i.hasNext() ) {
@@ -558,7 +558,7 @@
      * @see org.apache.cocoon.portal.coplets.basket.BasketManager#getBasket()
      */
     public Basket getBasket() {
-        Session session = ContextHelper.getRequest(this.context).getSession();
+        Session session = ObjectModelHelper.getRequest(this.portalService.getProcessInfoProvider().getObjectModel()).getSession();
         Basket basket = (Basket) session.getAttribute(BASKET_KEY);
         if ( basket == null ) {
             final String user = this.getUser();
@@ -579,7 +579,7 @@
      * @see org.apache.cocoon.portal.coplets.basket.BasketManager#getBriefcase()
      */
     public Briefcase getBriefcase() {
-        Session session = ContextHelper.getRequest(this.context).getSession();
+        Session session = ObjectModelHelper.getRequest(this.portalService.getProcessInfoProvider().getObjectModel()).getSession();
         Briefcase briefcase = (Briefcase) session.getAttribute(BRIEFCASE_KEY);
         if ( briefcase == null ) {
             briefcase = (Briefcase)this.loadContentStore(BRIEFCASE_KEY);
@@ -592,7 +592,7 @@
      * @see org.apache.cocoon.portal.coplets.basket.BasketManager#getFolder()
      */
     public Folder getFolder() {
-        Session session = ContextHelper.getRequest(this.context).getSession();
+        Session session = ObjectModelHelper.getRequest(this.portalService.getProcessInfoProvider().getObjectModel()).getSession();
         Folder folder = (Folder) session.getAttribute(FOLDER_KEY);
         if ( folder == null ) {
             folder = (Folder)this.loadContentStore(FOLDER_KEY);
@@ -605,7 +605,7 @@
      * @see org.apache.cocoon.portal.coplets.basket.BasketManager#getBriefcaseDescriptions()
      */
     public List getBriefcaseDescriptions() {
-        Session session = ContextHelper.getRequest(this.context).getSession();
+        Session session = ObjectModelHelper.getRequest(this.portalService.getProcessInfoProvider().getObjectModel()).getSession();
         List briefcases = (List)session.getAttribute(ALL_BRIEFCASES_KEY);
         if ( briefcases == null ) {
             briefcases = this.loadBriefcases();

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java Mon Sep  4 05:25:39 2006
@@ -52,6 +52,7 @@
 import org.apache.cocoon.portal.event.Event;
 import org.apache.cocoon.portal.event.Receiver;
 import org.apache.cocoon.portal.event.coplet.CopletInstanceSizingEvent;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.om.CopletDefinition;
 import org.apache.cocoon.portal.om.CopletInstance;
 import org.apache.cocoon.portal.om.Layout;
@@ -792,7 +793,9 @@
     public Object createObject(String className)
     throws Exception {
         final Object component = ClassUtils.newInstance(className);
-        ContainerUtil.enableLogging(component, this.getLogger());
+        if ( component instanceof AbstractLogEnabled ) {
+            ((AbstractLogEnabled)component).setLogger(this.getLogger());
+        }
         if (component instanceof RequiresConsumerEnvironment) {
             ((RequiresConsumerEnvironment)component).setConsumerEnvironment(this.consumerEnvironment);
         }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/GroupSessionImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/GroupSessionImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/GroupSessionImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/GroupSessionImpl.java Mon Sep  4 05:25:39 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.wsrp.consumer;
 
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
 import org.apache.wsrp4j.consumer.PortletSession;
 import org.apache.wsrp4j.consumer.driver.GenericGroupSessionImpl;
 import org.apache.wsrp4j.exception.WSRPException;
@@ -28,7 +28,7 @@
 public class GroupSessionImpl extends GenericGroupSessionImpl {
 
     /** The logger. */
-    protected Logger logger;
+    protected Log logger;
 
 	/**
 	 * Constructs a new <code>GroupSessionImpl</code> object with the given groupID.
@@ -42,7 +42,7 @@
      * @param logger
      * @throws WSRPException
      */
-    public GroupSessionImpl(String groupID, String markupInterfaceURL, Logger logger)
+    public GroupSessionImpl(String groupID, String markupInterfaceURL, Log logger)
     throws WSRPException {
         super(groupID, markupInterfaceURL);
         this.logger = logger;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java Mon Sep  4 05:25:39 2006
@@ -51,8 +51,8 @@
 import oasis.names.tc.wsrp.v1.types.ReleaseSessions;
 import oasis.names.tc.wsrp.v1.types.SetPortletProperties;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.cocoon.portal.PortalService;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.cocoon.portal.wsrp.logging.WSRPLogger;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.wsrp4j.consumer.ConsumerEnvironment;
@@ -91,21 +91,12 @@
     protected CookieProtocol initCookie = CookieProtocol.none;
     protected PortletDescription desc;
 
-    /** Our logger. */
     protected Logger logger;
 
     /** The portal service. */
     protected PortalService service;
 
     /**
-     * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
-     */
-    public void enableLogging(org.apache.avalon.framework.logger.Logger arg0) {
-        super.enableLogging(arg0);
-        this.logger = new WSRPLogger(arg0);
-    }
-
-    /**
      * @see org.apache.cocoon.portal.wsrp.consumer.RequiresConsumerEnvironment#setConsumerEnvironment(org.apache.wsrp4j.consumer.ConsumerEnvironment)
      */
     public void setConsumerEnvironment(ConsumerEnvironment env) {
@@ -447,13 +438,20 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
 
         }
 
         return response;
     }
 
+    protected Logger getWsrp4jLogger() {
+        if ( this.logger == null ) {
+            this.logger = new WSRPLogger(this.getLogger());
+        }
+        return this.logger;
+    }
+
     /**
      * This method is used to perform a blocking interaction on the portlet instance.
      * 
@@ -497,7 +495,7 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
 
         return response;
@@ -530,7 +528,7 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
 
         return response;
@@ -558,7 +556,7 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
 
         return response;
@@ -589,7 +587,7 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
 
         return response;
@@ -610,7 +608,7 @@
             markupPort.initCookie(request);
 
         } catch (java.rmi.RemoteException wsrpFault) {
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
     }
 
@@ -648,7 +646,7 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
 
         return response;
@@ -685,7 +683,7 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
 
         return response;
@@ -722,7 +720,7 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
 
         return response;
@@ -757,7 +755,7 @@
 
         } catch (java.rmi.RemoteException wsrpFault) {
 
-            WSRPXHelper.handleWSRPFault(logger, wsrpFault);
+            WSRPXHelper.handleWSRPFault(this.getWsrp4jLogger(), wsrpFault);
         }
 
         return response;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletSessionImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletSessionImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletSessionImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/PortletSessionImpl.java Mon Sep  4 05:25:39 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.wsrp.consumer;
 
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
 import org.apache.wsrp4j.consumer.PortletWindowSession;
 import org.apache.wsrp4j.consumer.driver.GenericPortletSessionImpl;
 import org.apache.wsrp4j.util.Modes;
@@ -31,7 +31,7 @@
 public class PortletSessionImpl extends GenericPortletSessionImpl {
 
     /** The logger. */
-    protected final Logger logger;
+    protected final Log logger;
 
     /**
      * constructor
@@ -39,7 +39,7 @@
      * @param handle
      * @param logger
      */
-    public PortletSessionImpl(String handle, Logger logger) {
+    public PortletSessionImpl(String handle, Log logger) {
     	super(handle);
         this.logger = logger;
     }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/SessionHandlerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/SessionHandlerImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/SessionHandlerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/SessionHandlerImpl.java Mon Sep  4 05:25:39 2006
@@ -17,7 +17,7 @@
 
 import java.util.Hashtable;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.wsrp4j.consumer.ConsumerEnvironment;
 import org.apache.wsrp4j.consumer.SessionHandler;
 import org.apache.wsrp4j.consumer.UserSession;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLRewriterImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLRewriterImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLRewriterImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLRewriterImpl.java Mon Sep  4 05:25:39 2006
@@ -18,7 +18,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.cocoon.portal.impl.AbstractLogEnabled;
 import org.apache.wsrp4j.consumer.URLGenerator;
 import org.apache.wsrp4j.consumer.URLRewriter;
 import org.apache.wsrp4j.util.Constants;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/UserSessionImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/UserSessionImpl.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/UserSessionImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/UserSessionImpl.java Mon Sep  4 05:25:39 2006
@@ -17,7 +17,7 @@
 
 import java.util.Hashtable;
 
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
 import org.apache.wsrp4j.consumer.GroupSessionMgr;
 import org.apache.wsrp4j.consumer.driver.GenericUserSessionImpl;
 import org.apache.wsrp4j.exception.WSRPException;
@@ -33,7 +33,7 @@
 public class UserSessionImpl extends GenericUserSessionImpl {
 
     /** The logger */
-    protected final Logger logger;
+    protected final Log logger;
 
     /**
      * Constructor <br/
@@ -47,7 +47,7 @@
     public UserSessionImpl(String producerID, 
                            String userID, 
                            String markupURL,
-                           Logger logger)
+                           Log    logger)
     throws WSRPException {
         super(producerID, userID, markupURL);
         this.logger = logger;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java Mon Sep  4 05:25:39 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.cocoon.portal.wsrp.logging;
 
+import org.apache.commons.logging.Log;
 import org.apache.wsrp4j.log.Logger;
 
 /**
@@ -24,15 +25,15 @@
  */
 public class WSRPLogger implements Logger {
 
-    /** The avalon logger */
-    protected final org.apache.avalon.framework.logger.Logger logger;
+    /** The default logger */
+    protected final Log logger;
 
     /**
      * constructor<br/>
      * 
      * @param logger
      */
-    public WSRPLogger(org.apache.avalon.framework.logger.Logger logger) {
+    public WSRPLogger(Log logger) {
         this.logger = logger;
     }
 

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonLoggerFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonLoggerFactoryBean.java?view=diff&rev=440049&r1=440048&r2=440049
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonLoggerFactoryBean.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonLoggerFactoryBean.java Mon Sep  4 05:25:39 2006
@@ -78,7 +78,7 @@
         subcontext.put("servlet-context", servletContext);
 
         final Log4JConfLoggerManager loggerManager = new Log4JConfLoggerManager();
-        loggerManager.enableLogging(new LoggerWrapper(this.log));
+        loggerManager.enableLogging(new CLLoggerWrapper(this.log));
         loggerManager.contextualize(subcontext);
 
         // Configure the log4j manager
@@ -134,127 +134,6 @@
 
     public void setConfiguration(String loggingConfiguration) {
         this.configuration = loggingConfiguration;
-    }
-
-    protected static final class LoggerWrapper implements Logger {
-
-        protected final Log log;
-
-        public LoggerWrapper(Log l) {
-            this.log = l;
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#debug(java.lang.String, java.lang.Throwable)
-         */
-        public void debug(String arg0, Throwable arg1) {
-            log.debug(arg0, arg1);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#debug(java.lang.String)
-         */
-        public void debug(String arg0) {
-            log.debug(arg0);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#error(java.lang.String, java.lang.Throwable)
-         */
-        public void error(String arg0, Throwable arg1) {
-            log.error(arg0, arg1);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#error(java.lang.String)
-         */
-        public void error(String arg0) {
-            log.error(arg0);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#fatalError(java.lang.String, java.lang.Throwable)
-         */
-        public void fatalError(String arg0, Throwable arg1) {
-            log.fatal(arg0, arg1);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#fatalError(java.lang.String)
-         */
-        public void fatalError(String arg0) {
-            log.fatal(arg0);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#info(java.lang.String, java.lang.Throwable)
-         */
-        public void info(String arg0, Throwable arg1) {
-            log.info(arg0, arg1);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#info(java.lang.String)
-         */
-        public void info(String arg0) {
-            log.info(arg0);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#isDebugEnabled()
-         */
-        public boolean isDebugEnabled() {
-            return log.isDebugEnabled();
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#isErrorEnabled()
-         */
-        public boolean isErrorEnabled() {
-            return log.isErrorEnabled();
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#isInfoEnabled()
-         */
-        public boolean isInfoEnabled() {
-            return log.isInfoEnabled();
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#isWarnEnabled()
-         */
-        public boolean isWarnEnabled() {
-            return log.isWarnEnabled();
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#warn(java.lang.String, java.lang.Throwable)
-         */
-        public void warn(String arg0, Throwable arg1) {
-            log.warn(arg0, arg1);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#warn(java.lang.String)
-         */
-        public void warn(String arg0) {
-            log.warn(arg0);
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#getChildLogger(java.lang.String)
-         */
-        public Logger getChildLogger(String arg0) {
-            return this;
-        }
-
-        /**
-         * @see org.apache.avalon.framework.logger.Logger#isFatalErrorEnabled()
-         */
-        public boolean isFatalErrorEnabled() {
-            return this.log.isFatalEnabled();
-        }
     }
 
     public void setCategory(String category) {

Added: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java?view=auto&rev=440049
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java (added)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java Mon Sep  4 05:25:39 2006
@@ -0,0 +1,125 @@
+package org.apache.cocoon.core.container.spring.avalon;
+
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+
+public class CLLoggerWrapper implements Logger {
+
+    protected final Log log;
+
+    public CLLoggerWrapper(Log l) {
+        this.log = l;
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#debug(java.lang.String, java.lang.Throwable)
+     */
+    public void debug(String arg0, Throwable arg1) {
+        log.debug(arg0, arg1);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#debug(java.lang.String)
+     */
+    public void debug(String arg0) {
+        log.debug(arg0);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#error(java.lang.String, java.lang.Throwable)
+     */
+    public void error(String arg0, Throwable arg1) {
+        log.error(arg0, arg1);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#error(java.lang.String)
+     */
+    public void error(String arg0) {
+        log.error(arg0);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#fatalError(java.lang.String, java.lang.Throwable)
+     */
+    public void fatalError(String arg0, Throwable arg1) {
+        log.fatal(arg0, arg1);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#fatalError(java.lang.String)
+     */
+    public void fatalError(String arg0) {
+        log.fatal(arg0);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#info(java.lang.String, java.lang.Throwable)
+     */
+    public void info(String arg0, Throwable arg1) {
+        log.info(arg0, arg1);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#info(java.lang.String)
+     */
+    public void info(String arg0) {
+        log.info(arg0);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#isDebugEnabled()
+     */
+    public boolean isDebugEnabled() {
+        return log.isDebugEnabled();
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#isErrorEnabled()
+     */
+    public boolean isErrorEnabled() {
+        return log.isErrorEnabled();
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#isInfoEnabled()
+     */
+    public boolean isInfoEnabled() {
+        return log.isInfoEnabled();
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#isWarnEnabled()
+     */
+    public boolean isWarnEnabled() {
+        return log.isWarnEnabled();
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#warn(java.lang.String, java.lang.Throwable)
+     */
+    public void warn(String arg0, Throwable arg1) {
+        log.warn(arg0, arg1);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#warn(java.lang.String)
+     */
+    public void warn(String arg0) {
+        log.warn(arg0);
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#getChildLogger(java.lang.String)
+     */
+    public Logger getChildLogger(String arg0) {
+        return this;
+    }
+
+    /**
+     * @see org.apache.avalon.framework.logger.Logger#isFatalErrorEnabled()
+     */
+    public boolean isFatalErrorEnabled() {
+        return this.log.isFatalEnabled();
+    }
+}

Propchange: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/CLLoggerWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message