Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r522901 - in
 /cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main:
 java/org/apache/cocoon/caching/impl/CacheImpl.java
 resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml
Date: Tue, 27 Mar 2007 13:29:39 -0000
To: cvs@cocoon.apache.org
From: reinhard@apache.org
Message-Id: <20070327132939.B88971A9838@eris.apache.org>

Author: reinhard
Date: Tue Mar 27 06:29:38 2007
New Revision: 522901

URL: http://svn.apache.org/viewvc?view=rev&rev=522901
Log:
CacheImpl: avalon->spring

Added:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml   (with props)
Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/impl/CacheImpl.java

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/impl/CacheImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/impl/CacheImpl.java?view=diff&rev=522901&r1=522900&r2=522901
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/impl/CacheImpl.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/impl/CacheImpl.java Tue Mar 27 06:29:38 2007
@@ -19,18 +19,11 @@
 import java.io.IOException;
 import java.io.Serializable;
 
-import org.apache.avalon.framework.activity.Disposable;
-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.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.Cache;
 import org.apache.cocoon.caching.CachedResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.excalibur.store.Store;
 
 /**
@@ -42,34 +35,13 @@
  * @since 2.1
  * @version $Id$
  */
-public class CacheImpl
-extends AbstractLogEnabled
-implements Cache, ThreadSafe, Serviceable, Disposable, Parameterizable {
+public class CacheImpl implements Cache {
 
+    private Log logger = LogFactory.getLog(getClass());    
+    
     /** The store containing the cached responses */
     protected Store store;
 
-    /** The service manager */
-    protected ServiceManager manager;
-
-    /**
-     * Serviceable Interface
-     */
-    public void service (ServiceManager manager) throws ServiceException {
-        this.manager = manager;
-    }
-
-    /**
-     * Disposable Interface
-     */
-    public void dispose() {
-        if ( this.manager != null ) {
-            this.manager.release(this.store);
-            this.store = null;
-            this.manager = null;
-        }
-    }
-
     /**
      * Store a cached response
      * @param key         the key used by the caching algorithm to identify the
@@ -134,17 +106,16 @@
 	public boolean containsKey(Serializable key) {
 		return this.store.containsKey(key);
 	}
-
-    /* (non-Javadoc)
-     * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
+    
+    /**
+     * Set the Store implementation
      */
-    public void parameterize(Parameters parameters) throws ParameterException {
-        String storeName = parameters.getParameter("store", Store.ROLE);
-        try {
-            this.store = (Store)this.manager.lookup(storeName);
-        } catch (ServiceException e) {
-            throw new ParameterException("Unable to lookup store: " + storeName, e);
-        }
+    public void setStore(Store store) {
+        this.store = store;
     }
+    
+    private Log getLogger() {
+        return this.logger;
+    }    
 
 }

Added: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml?view=auto&rev=522901
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml (added)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml Tue Mar 27 06:29:38 2007
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!-- SVN $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+  <!--+
+      | This is the Cocoon cache. This component is responsible for storing
+      | and retrieving cached responses. It can be used to monitor the cache
+      | or the investigate which responses are cached etc.
+      |
+      | The cache uses the store to save its values.
+      +-->
+  <bean name="org.apache.cocoon.caching.Cache" class="org.apache.cocoon.caching.impl.CacheImpl">
+    <property name="store" ref="org.apache.excalibur.store.Store"/>
+  </bean>
+
+</beans>
\ No newline at end of file

Propchange: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-impl-cache.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml