turbine-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r663696 - in /turbine/fulcrum/trunk/cache: project.xml src/java/org/apache/fulcrum/cache/impl/DefaultEHCacheService.java
Date Thu, 05 Jun 2008 18:27:17 GMT
Author: tv
Date: Thu Jun  5 11:27:17 2008
New Revision: 663696

URL: http://svn.apache.org/viewvc?rev=663696&view=rev
Log:
Remove unneeded dependencies. Prepare 1.1 release

Modified:
    turbine/fulcrum/trunk/cache/project.xml
    turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/DefaultEHCacheService.java

Modified: turbine/fulcrum/trunk/cache/project.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/project.xml?rev=663696&r1=663695&r2=663696&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/project.xml (original)
+++ turbine/fulcrum/trunk/cache/project.xml Thu Jun  5 11:27:17 2008
@@ -21,7 +21,7 @@
   <extend>${basedir}/../project.xml</extend>
   <id>fulcrum-cache</id>
   <name>Fulcrum Cache Component</name>
-  <currentVersion>1.1-dev</currentVersion>
+  <currentVersion>1.1</currentVersion>
   <versions>
     <version>
       <id>1.0.5</id>
@@ -38,13 +38,6 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
-      <url>http://commons.apache.org/lang/</url>
-    </dependency>
-
-    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>

Modified: turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/DefaultEHCacheService.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/DefaultEHCacheService.java?rev=663696&r1=663695&r2=663696&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/DefaultEHCacheService.java
(original)
+++ turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/DefaultEHCacheService.java
Thu Jun  5 11:27:17 2008
@@ -24,62 +24,50 @@
 
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
-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.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.fulcrum.cache.EHCacheService;
 
 /**
  * Default implementation of EHCacheService
- *
+ * 
  * @author <a href="mailto:epughNOSPAM@opensourceconnections.com">Eric Pugh </a>
- *
+ * 
  */
-public class DefaultEHCacheService implements EHCacheService, Serviceable, Disposable, Initializable,
-        ThreadSafe {
-
-    protected Log logger = LogFactory.getLog(DefaultEHCacheService.class.getName());
+public class DefaultEHCacheService extends AbstractLogEnabled 
+    implements EHCacheService, Disposable, Initializable, ThreadSafe
+{
 
     private CacheManager cacheManager;
 
-    public CacheManager getCacheManager(){
-    		return cacheManager;
-    }
-
-    public Cache getCache(String cacheName){
-    		return cacheManager.getCache(cacheName);
+    public CacheManager getCacheManager()
+    {
+        return cacheManager;
     }
 
-
-    /**
-     * @see org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
-     */
-    public void service(ServiceManager manager) throws ServiceException {
-
-
+    public Cache getCache(String cacheName)
+    {
+        return cacheManager.getCache(cacheName);
     }
 
     /**
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
-    public void initialize() throws Exception {
+    public void initialize() throws Exception
+    {
 
         cacheManager = CacheManager.create();
-        logger.debug("EHCacheService started!");
+        getLogger().debug("EHCacheService started!");
     }
 
     /**
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
-    public void dispose() {
-    		cacheManager.shutdown();
-    		cacheManager = null;
-    	    logger.debug("EHCacheService stopped!");
+    public void dispose()
+    {
+        cacheManager.shutdown();
+        cacheManager = null;
+        getLogger().debug("EHCacheService stopped!");
 
     }
-
-
 }



Mime
View raw message