(no commit message)

[utils] / support / general / src / main / java / org / wamblee / cache / EhCache.java

diff --git a/support/general/src/main/java/org/wamblee/cache/EhCache.java b/support/general/src/main/java/org/wamblee/cache/EhCache.java
index 1a760fa020687da08818f260425b005201e8ab96..9c32dda8b932329271e63b1d8507e3ff5cd733db 100644 (file)
--- a/support/general/src/main/java/org/wamblee/cache/EhCache.java
+++ b/support/general/src/main/java/org/wamblee/cache/EhCache.java
@@ -1,18 +1,18 @@
 /*
- * Copyright 2005 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * 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.wamblee.cache;
 
 import net.sf.ehcache.Cache;
@@ -20,13 +20,13 @@ import net.sf.ehcache.CacheException;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 
-import org.apache.log4j.Logger;
 
 import org.wamblee.io.InputResource;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.util.logging.Logger;
 
 /**
  * Cache implemented on top of EhCache.
@@ -36,7 +36,7 @@ import java.io.Serializable;
  */
 public class EhCache<KeyType extends Serializable, ValueType extends Serializable>
     implements org.wamblee.cache.Cache<KeyType, ValueType> {
-    private static final Logger LOGGER = Logger.getLogger(EhCache.class);
+    private static final Logger LOGGER = Logger.getLogger(EhCache.class.getName());
 
     /**
      * EH Cache manager.
@@ -68,7 +68,7 @@ public class EhCache<KeyType extends Serializable, ValueType extends Serializabl
             cache = manager.getCache(aCacheName);
 
             if (cache == null) {
-                LOGGER.warn("Creating cache '" + aCacheName +
+                LOGGER.warning("Creating cache '" + aCacheName +
                     "' because it is not configured");
                 manager.addCache(aCacheName);
                 cache = manager.getCache(aCacheName);