Author: bayard
Date: Thu Jul 28 15:04:15 2011
New Revision: 1151886
URL: http://svn.apache.org/viewvc?rev=1151886&view=rev
Log:
Upgrading JCS to Commons Lang 3.0
Modified:
commons/proper/jcs/trunk/pom.xml
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheEntry.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheManager.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/SafeCacheWrapper.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileContentType.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileDAO.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/lang/ref/KeyedRefCollector.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefCache.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefFileCache.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/SerializeUtils.java
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java
commons/proper/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java
commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/CacheEvent.java
commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/DiscoveredService.java
Modified: commons/proper/jcs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
--- commons/proper/jcs/trunk/pom.xml (original)
+++ commons/proper/jcs/trunk/pom.xml Thu Jul 28 15:04:15 2011
@@ -63,9 +63,9 @@
<!-- REQUIRED FOR JCS CORE -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.0</version>
<type>jar</type>
<scope>compile</scope>
<optional>true</optional>
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheEntry.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheEntry.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheEntry.java
Thu Jul 28 15:04:15 2011
@@ -20,8 +20,8 @@ package org.apache.jcs.yajcache.core;
*/
import java.util.Map;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.jcs.yajcache.lang.annotation.*;
/**
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheManager.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheManager.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheManager.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/CacheManager.java
Thu Jul 28 15:04:15 2011
@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.jcs.yajcache.file.CacheFileUtils;
import org.apache.jcs.yajcache.lang.annotation.*;
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/SafeCacheWrapper.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/SafeCacheWrapper.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/SafeCacheWrapper.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/core/SafeCacheWrapper.java
Thu Jul 28 15:04:15 2011
@@ -23,7 +23,7 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.jcs.yajcache.util.BeanUtils;
import org.apache.jcs.yajcache.util.SerializeUtils;
import org.apache.jcs.yajcache.lang.annotation.*;
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileContentType.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileContentType.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileContentType.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileContentType.java
Thu Jul 28 15:04:15 2011
@@ -20,7 +20,7 @@ package org.apache.jcs.yajcache.file;
*/
import java.io.Serializable;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.jcs.yajcache.lang.annotation.*;
/**
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileDAO.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileDAO.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileDAO.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/file/CacheFileDAO.java
Thu Jul 28 15:04:15 2011
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jcs.yajcache.lang.annotation.*;
-import org.apache.commons.lang.builder.*;
+import org.apache.commons.lang3.builder.*;
/**
@@ -128,7 +128,7 @@ public enum CacheFileDAO {
} catch(IOException ex) {
countReadIOException.incrementAndGet();
log.warn(ex.getClass().getName(), ex);
- } catch(org.apache.commons.lang.SerializationException ex) {
+ } catch(org.apache.commons.lang3.SerializationException ex) {
countReadIOException.incrementAndGet();
log.warn(ex.getClass().getName(), ex);
} finally {
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/lang/ref/KeyedRefCollector.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/lang/ref/KeyedRefCollector.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/lang/ref/KeyedRefCollector.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/lang/ref/KeyedRefCollector.java
Thu Jul 28 15:04:15 2011
@@ -23,7 +23,7 @@ import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefCache.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefCache.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefCache.java
Thu Jul 28 15:04:15 2011
@@ -29,7 +29,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jcs.yajcache.config.PerCacheConfig;
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefFileCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefFileCache.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefFileCache.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/soft/SoftRefFileCache.java
Thu Jul 28 15:04:15 2011
@@ -33,10 +33,10 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.locks.Lock;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.jcs.yajcache.beans.CacheChangeSupport;
import org.apache.jcs.yajcache.beans.ICacheChangeListener;
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/SerializeUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/SerializeUtils.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/SerializeUtils.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/SerializeUtils.java
Thu Jul 28 15:04:15 2011
@@ -21,7 +21,7 @@ package org.apache.jcs.yajcache.util;
import java.io.Serializable;
import java.lang.reflect.Array;
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.jcs.yajcache.lang.annotation.*;
/**
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/src/org/apache/jcs/yajcache/util/concurrent/locks/KeyedReadWriteLock.java
Thu Jul 28 15:04:15 2011
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.jcs.yajcache.lang.ref.KeyedRefCollector;
import org.apache.jcs.yajcache.lang.ref.KeyedWeakReference;
Modified:
commons/proper/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java
(original)
+++
commons/proper/jcs/trunk/sandbox/yajcache/test/org/apache/jcs/yajcache/util/TestSerializable.java
Thu Jul 28 15:04:15 2011
@@ -20,7 +20,7 @@ package org.apache.jcs.yajcache.util;
*/
import java.io.Serializable;
-import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.jcs.yajcache.lang.annotation.*;
/**
Modified:
commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/CacheEvent.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/CacheEvent.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/CacheEvent.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/jcs/engine/logging/CacheEvent.java
Thu Jul 28 15:04:15 2011
@@ -2,7 +2,7 @@ package org.apache.jcs.engine.logging;
import java.io.Serializable;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.jcs.engine.logging.behavior.ICacheEvent;
/** It's returned from create and passed into log. */
Modified:
commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/DiscoveredService.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/DiscoveredService.java?rev=1151886&r1=1151885&r2=1151886&view=diff
==============================================================================
---
commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/DiscoveredService.java
(original)
+++
commons/proper/jcs/trunk/src/java/org/apache/jcs/utils/discovery/DiscoveredService.java
Thu Jul 28 15:04:15 2011
@@ -22,8 +22,8 @@ package org.apache.jcs.utils.discovery;
import java.io.Serializable;
import java.util.ArrayList;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
/**
* This contains info about a discovered service. These objects are stored in
a set in the
