You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2002/03/01 18:46:25 UTC
cvs commit: jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/threads ThreadPool.java
dlr 02/03/01 09:46:25
Modified: src/java/org/apache/stratum/jcs/access CacheAccess.java
GroupCacheAccess.java TestCacheAccess.java
src/java/org/apache/stratum/jcs/access/monitor
MonitorAccess.java MonitorXMLRPCServer.java
src/java/org/apache/stratum/jcs/auxiliary/disk
AbstractDiskCache.java
src/java/org/apache/stratum/jcs/auxiliary/disk/hsql
HSQLCache.java HSQLCacheFactory.java
HSQLCacheManager.java HSQLCacheNoWaitBuffer.java
src/java/org/apache/stratum/jcs/auxiliary/disk/indexed
IndexedDisk.java IndexedDiskCache.java
IndexedDiskCacheFactory.java
IndexedDiskCacheManager.java
src/java/org/apache/stratum/jcs/auxiliary/disk/jisp
JISPCache.java JISPCacheFactory.java
JISPCacheManager.java JISPCacheNoWaitBuffer.java
JISPKey.java
src/java/org/apache/stratum/jcs/auxiliary/lateral
LateralCache.java LateralCacheFactory.java
LateralCacheManager.java LateralCacheMonitor.java
LateralCacheNoWait.java
LateralCacheNoWaitFacade.java
LateralCacheRestore.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/http/broadcast
LateralCacheMulticaster.java
LateralCacheThread.java LateralCacheUnicaster.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/http/remove
DeleteLateralCacheMulticaster.java
DeleteLateralCacheUnicaster.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/http/server
AbstractDeleteCacheServlet.java
LateralCacheServletReciever.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups
JGConnectionHolder.java LateralCacheJGListener.java
LateralGroupCacheJGListener.java
LateralJGReceiver.java
LateralJGReceiverConnection.java
LateralJGSender.java LateralJGService.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/utils
JGRpcOpener.java JGSocketOpener.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp
LateralCacheTCPListener.java
LateralGroupCacheTCPListener.java
LateralTCPReceiver.java
LateralTCPReceiverConnection.java
LateralTCPSender.java LateralTCPService.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp
LateralCacheUDPListener.java
LateralGroupCacheUDPListener.java
LateralUDPReceiver.java LateralUDPSender.java
LateralUDPService.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc
LateralCacheXMLRPCListener.java
LateralGroupCacheXMLRPCListener.java
LateralXMLRPCReceiver.java
LateralXMLRPCReceiverConnection.java
LateralXMLRPCSender.java LateralXMLRPCService.java
src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/utils
XMLRPCSocketOpener.java
src/java/org/apache/stratum/jcs/auxiliary/remote
RemoteCache.java RemoteCacheFactory.java
RemoteCacheFailoverRunner.java
RemoteCacheListener.java RemoteCacheManager.java
RemoteCacheMonitor.java RemoteCacheNoWait.java
RemoteCacheNoWaitFacade.java
RemoteCacheRestore.java RemoteUtils.java
src/java/org/apache/stratum/jcs/auxiliary/remote/group
RemoteGroupCacheListener.java
src/java/org/apache/stratum/jcs/auxiliary/remote/server
RemoteCacheClusterFactory.java
RemoteCacheClusterManager.java
RemoteCacheClusterMonitor.java
RemoteCacheClusterRestore.java
RemoteCacheServer.java
RemoteCacheServerFactory.java
RemoteCacheServerListener.java
src/java/org/apache/stratum/jcs/auxiliary/remote/server/group
RemoteGroupCacheServerFactory.java
src/java/org/apache/stratum/jcs/config OptionConverter.java
PropertySetter.java
src/java/org/apache/stratum/jcs/engine CacheAdaptor.java
CacheEventQueue.java CacheWatchRepairable.java
src/java/org/apache/stratum/jcs/engine/control Cache.java
CacheManagerFactory.java
CompositeCacheConfigurator.java
CompositeCacheManager.java
src/java/org/apache/stratum/jcs/engine/control/group
GroupCache.java GroupCacheManager.java
GroupCacheManagerFactory.java
GroupRWLockManager.java
src/java/org/apache/stratum/jcs/engine/memory/lru
LRUMemoryCache.java
src/java/org/apache/stratum/jcs/engine/memory/mru
MRUMemoryCache.java
src/java/org/apache/stratum/jcs/engine/memory/shrinking
ShrinkerThread.java ShrinkingMemoryCache.java
src/java/org/apache/stratum/jcs/test/servlet
ListTestCacheServlet.java
SessionExampleServlet.java
src/java/org/apache/stratum/jcs/utils/config
IUtilConstants.java
src/java/org/apache/stratum/jcs/utils/locking
ReadWriteLock.java ReadWriteLockManager.java
RwLockGC.java
src/java/org/apache/stratum/jcs/utils/servlet
BasicHttpAuthenticator.java
src/java/org/apache/stratum/jcs/utils/servlet/session
DistSession.java DistSessionGC.java
DistSessionPoolManager.java DistSessionTracker.java
src/java/org/apache/stratum/jcs/utils/threads
ThreadPool.java
Log:
Updated for Commons Logging release 1.0.
Revision Changes Path
1.11 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/CacheAccess.java
Index: CacheAccess.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/CacheAccess.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- CacheAccess.java 18 Feb 2002 17:14:22 -0000 1.10
+++ CacheAccess.java 1 Mar 2002 17:46:18 -0000 1.11
@@ -72,7 +72,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Class which provides interface for all access to the cache. An instance of
@@ -81,12 +81,12 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created February 13, 2002
- * @version $Id: CacheAccess.java,v 1.10 2002/02/18 17:14:22 asmuts Exp $
+ * @version $Id: CacheAccess.java,v 1.11 2002/03/01 17:46:18 dlr Exp $
*/
public class CacheAccess implements ICacheAccess
{
private final static Log log =
- LogSource.getInstance( CacheAccess.class );
+ LogFactory.getFactory().getInstance( CacheAccess.class );
/**
* Cache manager use by the various forms of defineRegion and getAccess
1.15 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/GroupCacheAccess.java
Index: GroupCacheAccess.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/GroupCacheAccess.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- GroupCacheAccess.java 18 Feb 2002 17:14:22 -0000 1.14
+++ GroupCacheAccess.java 1 Mar 2002 17:46:18 -0000 1.15
@@ -87,7 +87,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupId;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
// CACHE
@@ -100,7 +100,7 @@
public class GroupCacheAccess extends CacheAccess implements IGroupCacheAccess
{
private final static Log log =
- LogSource.getInstance( GroupCacheAccess.class );
+ LogFactory.getFactory().getInstance( GroupCacheAccess.class );
private static boolean SET_ATTR_INVOCATION = true;
private static boolean REMOVE_ATTR_INVOCATION = false;
1.17 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/TestCacheAccess.java
Index: TestCacheAccess.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/TestCacheAccess.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- TestCacheAccess.java 21 Feb 2002 06:59:28 -0000 1.16
+++ TestCacheAccess.java 1 Mar 2002 17:46:18 -0000 1.17
@@ -74,7 +74,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManagerFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
// CACHE
@@ -88,7 +88,7 @@
public class TestCacheAccess
{
private final static Log log =
- LogSource.getInstance( TestCacheAccess.class );
+ LogFactory.getFactory().getInstance( TestCacheAccess.class );
static GroupCacheAccess cache_control = null;
1.5 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/monitor/MonitorAccess.java
Index: MonitorAccess.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/monitor/MonitorAccess.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- MonitorAccess.java 18 Feb 2002 02:43:09 -0000 1.4
+++ MonitorAccess.java 1 Mar 2002 17:46:18 -0000 1.5
@@ -16,7 +16,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManagerFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Exposes the simple monitoring methods to the public in a simple manner.
@@ -27,7 +27,7 @@
public class MonitorAccess implements Serializable
{
private final static Log log =
- LogSource.getInstance( MonitorAccess.class );
+ LogFactory.getFactory().getInstance( MonitorAccess.class );
/** Description of the Field */
protected GroupCacheManager cacheMgr;
1.4 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/monitor/MonitorXMLRPCServer.java
Index: MonitorXMLRPCServer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/access/monitor/MonitorXMLRPCServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- MonitorXMLRPCServer.java 16 Feb 2002 02:37:17 -0000 1.3
+++ MonitorXMLRPCServer.java 1 Mar 2002 17:46:18 -0000 1.4
@@ -5,7 +5,7 @@
import org.apache.xmlrpc.WebServer;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Starts an xml rpc server for cache monitoring.
@@ -16,7 +16,7 @@
public class MonitorXMLRPCServer
{
private final static Log log =
- LogSource.getInstance( MonitorXMLRPCServer.class );
+ LogFactory.getFactory().getInstance( MonitorXMLRPCServer.class );
/**
* Constructor for the MonitorXMLRPCServer object
1.3 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/AbstractDiskCache.java
Index: AbstractDiskCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/AbstractDiskCache.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- AbstractDiskCache.java 25 Feb 2002 01:52:28 -0000 1.2
+++ AbstractDiskCache.java 1 Mar 2002 17:46:18 -0000 1.3
@@ -55,7 +55,7 @@
*/
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.engine.CacheElement;
import org.apache.stratum.jcs.engine.CacheEventQueue;
import org.apache.stratum.jcs.engine.CacheInfo;
@@ -87,12 +87,12 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: AbstractDiskCache.java,v 1.2 2002/02/25 01:52:28 jtaylor Exp $
+ * @version $Id: AbstractDiskCache.java,v 1.3 2002/03/01 17:46:18 dlr Exp $
*/
public abstract class AbstractDiskCache implements ICache, Serializable
{
private final static Log log =
- LogSource.getInstance( AbstractDiskCache.class );
+ LogFactory.getFactory().getInstance( AbstractDiskCache.class );
/**
* Map where elements are stored between being added to this cache and
1.11 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/hsql/HSQLCache.java
Index: HSQLCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/hsql/HSQLCache.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- HSQLCache.java 24 Feb 2002 19:18:04 -0000 1.10
+++ HSQLCache.java 1 Mar 2002 17:46:18 -0000 1.11
@@ -84,7 +84,7 @@
import org.apache.stratum.jcs.utils.data.PropertyGroups;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author Aaron Smuts
@@ -94,7 +94,7 @@
public class HSQLCache implements ICache, Serializable
{
private final static Log log =
- LogSource.getInstance( HSQLCache.class );
+ LogFactory.getFactory().getInstance( HSQLCache.class );
private static int numCreated = 0;
private int numInstances = 0;
1.7 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/hsql/HSQLCacheFactory.java
Index: HSQLCacheFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/hsql/HSQLCacheFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- HSQLCacheFactory.java 16 Feb 2002 02:37:18 -0000 1.6
+++ HSQLCacheFactory.java 1 Mar 2002 17:46:18 -0000 1.7
@@ -61,7 +61,7 @@
import org.apache.stratum.jcs.engine.behavior.ICache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author Aaron Smuts
@@ -72,7 +72,7 @@
public class HSQLCacheFactory implements IAuxiliaryCacheFactory
{
private final static Log log =
- LogSource.getInstance( HSQLCacheFactory.class );
+ LogFactory.getFactory().getInstance( HSQLCacheFactory.class );
private static String name;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/hsql/HSQLCacheManager.java
Index: HSQLCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/hsql/HSQLCacheManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- HSQLCacheManager.java 23 Feb 2002 20:39:11 -0000 1.7
+++ HSQLCacheManager.java 1 Mar 2002 17:46:19 -0000 1.8
@@ -62,7 +62,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -73,7 +73,7 @@
public class HSQLCacheManager implements ICacheManager
{
private final static Log log =
- LogSource.getInstance( HSQLCacheManager.class );
+ LogFactory.getFactory().getInstance( HSQLCacheManager.class );
private static int clients;
1.9 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/hsql/HSQLCacheNoWaitBuffer.java
Index: HSQLCacheNoWaitBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/hsql/HSQLCacheNoWaitBuffer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- HSQLCacheNoWaitBuffer.java 24 Feb 2002 19:18:04 -0000 1.8
+++ HSQLCacheNoWaitBuffer.java 1 Mar 2002 17:46:19 -0000 1.9
@@ -73,7 +73,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheEventQueue;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Store recent arivals in a temporary queue. Used to queue up update requests
@@ -94,7 +94,7 @@
public class HSQLCacheNoWaitBuffer implements ICache
{
private final static Log log =
- LogSource.getInstance( HSQLCacheNoWaitBuffer.class );
+ LogFactory.getFactory().getInstance( HSQLCacheNoWaitBuffer.class );
/** Description of the Field */
protected Hashtable purgatory = new Hashtable();
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/indexed/IndexedDisk.java
Index: IndexedDisk.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/indexed/IndexedDisk.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- IndexedDisk.java 17 Feb 2002 06:59:19 -0000 1.1
+++ IndexedDisk.java 1 Mar 2002 17:46:19 -0000 1.2
@@ -69,7 +69,7 @@
import org.apache.stratum.jcs.engine.CacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Provides thread safe access to the underlying random access file.
@@ -80,7 +80,7 @@
class IndexedDisk
{
private final static Log log =
- LogSource.getInstance( IndexedDisk.class );
+ LogFactory.getFactory().getInstance( IndexedDisk.class );
private final String filepath;
1.6 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
Index: IndexedDiskCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/indexed/IndexedDiskCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- IndexedDiskCache.java 25 Feb 2002 01:52:28 -0000 1.5
+++ IndexedDiskCache.java 1 Mar 2002 17:46:19 -0000 1.6
@@ -55,7 +55,7 @@
*/
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.auxiliary.disk.AbstractDiskCache;
import org.apache.stratum.jcs.auxiliary.disk.indexed.behavior.IIndexedDiskCacheAttributes;
import org.apache.stratum.jcs.engine.CacheElement;
@@ -74,12 +74,12 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: IndexedDiskCache.java,v 1.5 2002/02/25 01:52:28 jtaylor Exp $
+ * @version $Id: IndexedDiskCache.java,v 1.6 2002/03/01 17:46:19 dlr Exp $
*/
public class IndexedDiskCache extends AbstractDiskCache
{
private final static Log log =
- LogSource.getInstance( IndexedDiskCache.class );
+ LogFactory.getFactory().getInstance( IndexedDiskCache.class );
private String fileName;
private String cacheName;
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
Index: IndexedDiskCacheFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/indexed/IndexedDiskCacheFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- IndexedDiskCacheFactory.java 17 Feb 2002 06:59:19 -0000 1.1
+++ IndexedDiskCacheFactory.java 1 Mar 2002 17:46:19 -0000 1.2
@@ -61,7 +61,7 @@
import org.apache.stratum.jcs.engine.behavior.ICache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author Aaron Smuts
@@ -72,7 +72,7 @@
public class IndexedDiskCacheFactory implements IAuxiliaryCacheFactory
{
private final static Log log =
- LogSource.getInstance( IndexedDiskCacheFactory.class );
+ LogFactory.getFactory().getInstance( IndexedDiskCacheFactory.class );
private static String name;
1.3 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java
Index: IndexedDiskCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- IndexedDiskCacheManager.java 24 Feb 2002 19:18:05 -0000 1.2
+++ IndexedDiskCacheManager.java 1 Mar 2002 17:46:19 -0000 1.3
@@ -55,7 +55,7 @@
*/
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.auxiliary.disk.indexed.behavior.IIndexedDiskCacheAttributes;
import org.apache.stratum.jcs.engine.behavior.ICache;
import org.apache.stratum.jcs.engine.behavior.ICacheManager;
@@ -68,12 +68,12 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: IndexedDiskCacheManager.java,v 1.2 2002/02/24 19:18:05 jtaylor Exp $
+ * @version $Id: IndexedDiskCacheManager.java,v 1.3 2002/03/01 17:46:19 dlr Exp $
*/
public class IndexedDiskCacheManager implements ICacheManager
{
private final static Log log =
- LogSource.getInstance( IndexedDiskCacheManager.class );
+ LogFactory.getFactory().getInstance( IndexedDiskCacheManager.class );
private static int clients;
1.16 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPCache.java
Index: JISPCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPCache.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- JISPCache.java 24 Feb 2002 19:18:05 -0000 1.15
+++ JISPCache.java 1 Mar 2002 17:46:19 -0000 1.16
@@ -74,7 +74,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* JISP disk cache implementation. Slow as hell with this type of key.
@@ -86,7 +86,7 @@
public class JISPCache implements ICache, Serializable
{
private final static Log log =
- LogSource.getInstance( JISPCache.class );
+ LogFactory.getFactory().getInstance( JISPCache.class );
private static int numCreated = 0;
private int numInstances = 0;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPCacheFactory.java
Index: JISPCacheFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPCacheFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- JISPCacheFactory.java 16 Feb 2002 02:37:18 -0000 1.5
+++ JISPCacheFactory.java 1 Mar 2002 17:46:19 -0000 1.6
@@ -15,7 +15,7 @@
import org.apache.stratum.jcs.engine.behavior.ICache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author Aaron Smuts
@@ -26,7 +26,7 @@
public class JISPCacheFactory implements IAuxiliaryCacheFactory
{
private final static Log log =
- LogSource.getInstance( JISPCacheFactory.class );
+ LogFactory.getFactory().getInstance( JISPCacheFactory.class );
private static String name;
1.7 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPCacheManager.java
Index: JISPCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPCacheManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- JISPCacheManager.java 23 Feb 2002 20:39:11 -0000 1.6
+++ JISPCacheManager.java 1 Mar 2002 17:46:19 -0000 1.7
@@ -16,7 +16,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -27,7 +27,7 @@
public class JISPCacheManager implements ICacheManager
{
private final static Log log =
- LogSource.getInstance( JISPCacheManager.class );
+ LogFactory.getFactory().getInstance( JISPCacheManager.class );
private static int clients;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPCacheNoWaitBuffer.java
Index: JISPCacheNoWaitBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPCacheNoWaitBuffer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- JISPCacheNoWaitBuffer.java 24 Feb 2002 19:18:05 -0000 1.7
+++ JISPCacheNoWaitBuffer.java 1 Mar 2002 17:46:19 -0000 1.8
@@ -27,7 +27,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheEventQueue;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Store recent arivals in a temporary queue. Used to queue up update requests
@@ -48,7 +48,7 @@
public class JISPCacheNoWaitBuffer implements ICache
{
private final static Log log =
- LogSource.getInstance( JISPCacheNoWaitBuffer.class );
+ LogFactory.getFactory().getInstance( JISPCacheNoWaitBuffer.class );
/** Description of the Field */
protected Hashtable purgatory = new Hashtable();
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPKey.java
Index: JISPKey.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/disk/jisp/JISPKey.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- JISPKey.java 23 Feb 2002 20:39:11 -0000 1.7
+++ JISPKey.java 1 Mar 2002 17:46:19 -0000 1.8
@@ -15,7 +15,7 @@
import java.io.Serializable;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -26,7 +26,7 @@
public class JISPKey extends KeyObject
{
private final static Log log =
- LogSource.getInstance( JISPKey.class );
+ LogFactory.getFactory().getInstance( JISPKey.class );
/** Description of the Field */
public Serializable m_key;
1.12 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCache.java
Index: LateralCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCache.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- LateralCache.java 24 Feb 2002 19:18:05 -0000 1.11
+++ LateralCache.java 1 Mar 2002 17:46:20 -0000 1.12
@@ -16,7 +16,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheType;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.engine.behavior.IZombie;
@@ -29,7 +29,7 @@
public class LateralCache implements ICache
{
private final static Log log =
- LogSource.getInstance( LateralCache.class );
+ LogFactory.getFactory().getInstance( LateralCache.class );
private static int numCreated = 0;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheFactory.java
Index: LateralCacheFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- LateralCacheFactory.java 24 Feb 2002 06:16:16 -0000 1.7
+++ LateralCacheFactory.java 1 Mar 2002 17:46:20 -0000 1.8
@@ -10,7 +10,7 @@
import org.apache.stratum.jcs.engine.behavior.ICache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
//import org.apache.stratum.jcs.auxiliary.*;
@@ -27,7 +27,7 @@
public class LateralCacheFactory implements IAuxiliaryCacheFactory
{
private final static Log log =
- LogSource.getInstance( LateralCacheFactory.class );
+ LogFactory.getFactory().getInstance( LateralCacheFactory.class );
private static String name;
1.10 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheManager.java
Index: LateralCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- LateralCacheManager.java 24 Feb 2002 07:08:04 -0000 1.9
+++ LateralCacheManager.java 1 Mar 2002 17:46:20 -0000 1.10
@@ -41,7 +41,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheAttributes;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
//import org.apache.stratum.jcs.auxiliary.*;
//import org.apache.stratum.jcs.auxiliary.lateral.http.*;
@@ -60,7 +60,7 @@
public class LateralCacheManager implements IAuxiliaryCacheManager
{
private final static Log log =
- LogSource.getInstance( LateralCacheManager.class );
+ LogFactory.getFactory().getInstance( LateralCacheManager.class );
//static ArrayList defaultServers;
ICacheAttributes defaultCattr;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheMonitor.java
Index: LateralCacheMonitor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheMonitor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- LateralCacheMonitor.java 16 Feb 2002 02:37:18 -0000 1.5
+++ LateralCacheMonitor.java 1 Mar 2002 17:46:20 -0000 1.6
@@ -7,7 +7,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.LateralCacheRestore;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Used to monitor and repair any failed connection for the lateral cache
@@ -23,7 +23,7 @@
public class LateralCacheMonitor implements Runnable
{
private final static Log log =
- LogSource.getInstance( LateralCacheManager.class );
+ LogFactory.getFactory().getInstance( LateralCacheManager.class );
private static LateralCacheMonitor instance;
private static long idlePeriod = 20 * 1000;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheNoWait.java
Index: LateralCacheNoWait.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheNoWait.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- LateralCacheNoWait.java 24 Feb 2002 19:18:05 -0000 1.7
+++ LateralCacheNoWait.java 1 Mar 2002 17:46:20 -0000 1.8
@@ -17,7 +17,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheEventQueue;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
//import org.apache.stratum.jcs.auxiliary.lateral.socket.tcp.*;
@@ -31,7 +31,7 @@
public class LateralCacheNoWait implements ICache
{
private final static Log log =
- LogSource.getInstance( LateralCacheNoWait.class );
+ LogFactory.getFactory().getInstance( LateralCacheNoWait.class );
private final LateralCache cache;
private ICacheEventQueue q;
1.10 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
Index: LateralCacheNoWaitFacade.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- LateralCacheNoWaitFacade.java 24 Feb 2002 19:18:05 -0000 1.9
+++ LateralCacheNoWaitFacade.java 1 Mar 2002 17:46:20 -0000 1.10
@@ -11,7 +11,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
//import org.apache.stratum.jcs.auxiliary.lateral.socket.tcp.*;
@@ -27,7 +27,7 @@
public class LateralCacheNoWaitFacade implements ICache
{
private final static Log log =
- LogSource.getInstance( LateralCacheNoWaitFacade.class );
+ LogFactory.getFactory().getInstance( LateralCacheNoWaitFacade.class );
/** Description of the Field */
public LateralCacheNoWait[] noWaits;
1.9 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheRestore.java
Index: LateralCacheRestore.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/LateralCacheRestore.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- LateralCacheRestore.java 24 Feb 2002 08:20:37 -0000 1.8
+++ LateralCacheRestore.java 1 Mar 2002 17:46:20 -0000 1.9
@@ -14,7 +14,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheRestore;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Used to repair the lateral caches managed by the associated instance of
@@ -26,7 +26,7 @@
public class LateralCacheRestore implements ICacheRestore
{
private final static Log log =
- LogSource.getInstance( LateralCacheRestore.class );
+ LogFactory.getFactory().getInstance( LateralCacheRestore.class );
private final LateralCacheManager lcm;
private boolean canFix = true;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/broadcast/LateralCacheMulticaster.java
Index: LateralCacheMulticaster.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/broadcast/LateralCacheMulticaster.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- LateralCacheMulticaster.java 16 Feb 2002 19:06:34 -0000 1.7
+++ LateralCacheMulticaster.java 1 Mar 2002 17:46:20 -0000 1.8
@@ -8,7 +8,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.utils.threads.ThreadPoolManager;
@@ -24,7 +24,7 @@
public class LateralCacheMulticaster
{
private final static Log log =
- LogSource.getInstance( LateralCacheMulticaster.class );
+ LogFactory.getFactory().getInstance( LateralCacheMulticaster.class );
private final static String servlet = "/cache/cache/LateralCacheServletReceiver";
private final ICacheElement ice;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/broadcast/LateralCacheThread.java
Index: LateralCacheThread.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/broadcast/LateralCacheThread.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- LateralCacheThread.java 16 Feb 2002 02:37:19 -0000 1.5
+++ LateralCacheThread.java 1 Mar 2002 17:46:20 -0000 1.6
@@ -16,7 +16,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author Aaron Smuts
@@ -26,7 +26,7 @@
public class LateralCacheThread extends Thread
{
private final static Log log =
- LogSource.getInstance( LateralCacheThread.class );
+ LogFactory.getFactory().getInstance( LateralCacheThread.class );
private final static String servlet = "/rcash/ramraf/DistCacheServlet";
1.7 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/broadcast/LateralCacheUnicaster.java
Index: LateralCacheUnicaster.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/broadcast/LateralCacheUnicaster.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- LateralCacheUnicaster.java 16 Feb 2002 19:06:34 -0000 1.6
+++ LateralCacheUnicaster.java 1 Mar 2002 17:46:20 -0000 1.7
@@ -14,7 +14,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.utils.threads.IThreadPoolRunnable;
@@ -28,7 +28,7 @@
implements IThreadPoolRunnable
{
private final static Log log =
- LogSource.getInstance( LateralCacheUnicaster.class );
+ LogFactory.getFactory().getInstance( LateralCacheUnicaster.class );
private final ICacheElement item;
private final String urlStr;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/remove/DeleteLateralCacheMulticaster.java
Index: DeleteLateralCacheMulticaster.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/remove/DeleteLateralCacheMulticaster.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- DeleteLateralCacheMulticaster.java 16 Feb 2002 19:06:34 -0000 1.7
+++ DeleteLateralCacheMulticaster.java 1 Mar 2002 17:46:20 -0000 1.8
@@ -6,7 +6,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.http.remove.DeleteLateralCacheUnicaster;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.utils.threads.ThreadPoolManager;
@@ -22,7 +22,7 @@
public class DeleteLateralCacheMulticaster
{
private final static Log log =
- LogSource.getInstance( DeleteLateralCacheMulticaster.class );
+ LogFactory.getFactory().getInstance( DeleteLateralCacheMulticaster.class );
// must get servletName from the props file
private final String servlet;
1.7 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/remove/DeleteLateralCacheUnicaster.java
Index: DeleteLateralCacheUnicaster.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/remove/DeleteLateralCacheUnicaster.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- DeleteLateralCacheUnicaster.java 16 Feb 2002 19:06:34 -0000 1.6
+++ DeleteLateralCacheUnicaster.java 1 Mar 2002 17:46:20 -0000 1.7
@@ -7,7 +7,7 @@
import java.net.URLConnection;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.utils.threads.IThreadPoolRunnable;
@@ -20,7 +20,7 @@
public class DeleteLateralCacheUnicaster implements IThreadPoolRunnable
{
private final static Log log =
- LogSource.getInstance( DeleteLateralCacheUnicaster.class );
+ LogFactory.getFactory().getInstance( DeleteLateralCacheUnicaster.class );
private final String hashtableName;
private final String key;
1.7 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/server/AbstractDeleteCacheServlet.java
Index: AbstractDeleteCacheServlet.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/server/AbstractDeleteCacheServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- AbstractDeleteCacheServlet.java 18 Feb 2002 02:43:10 -0000 1.6
+++ AbstractDeleteCacheServlet.java 1 Mar 2002 17:46:20 -0000 1.7
@@ -25,7 +25,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.utils.servlet.BasicHttpAuthenticator;
@@ -39,7 +39,7 @@
extends HttpServlet implements SingleThreadModel
{
private final static Log log =
- LogSource.getInstance( AbstractDeleteCacheServlet.class );
+ LogFactory.getFactory().getInstance( AbstractDeleteCacheServlet.class );
/** Description of the Field */
protected GroupCacheManager cacheMgr;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/server/LateralCacheServletReciever.java
Index: LateralCacheServletReciever.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/http/server/LateralCacheServletReciever.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- LateralCacheServletReciever.java 16 Feb 2002 02:37:19 -0000 1.5
+++ LateralCacheServletReciever.java 1 Mar 2002 17:46:20 -0000 1.6
@@ -24,7 +24,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author Aaron Smuts
@@ -34,7 +34,7 @@
public class LateralCacheServletReciever extends HttpServlet
{
private final static Log log =
- LogSource.getInstance( LateralCacheServletReciever.class );
+ LogFactory.getFactory().getInstance( LateralCacheServletReciever.class );
private static CompositeCacheManager cacheMgr;
1.3 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java
Index: JGConnectionHolder.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- JGConnectionHolder.java 1 Mar 2002 17:30:12 -0000 1.2
+++ JGConnectionHolder.java 1 Mar 2002 17:46:20 -0000 1.3
@@ -65,7 +65,7 @@
import org.javagroups.blocks.GroupRequest;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.auxiliary.lateral.javagroups.behavior.ILateralCacheJGListener;
import org.apache.stratum.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
@@ -80,7 +80,7 @@
{
private final static Log log =
- LogSource.getInstance( JGConnectionHolder.class );
+ LogFactory.getFactory().getInstance( JGConnectionHolder.class );
private Channel jg;
private RpcDispatcher disp;
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java
Index: LateralCacheJGListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralCacheJGListener.java 24 Feb 2002 06:15:42 -0000 1.1
+++ LateralCacheJGListener.java 1 Mar 2002 17:46:20 -0000 1.2
@@ -73,7 +73,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -86,7 +86,7 @@
public class LateralCacheJGListener implements ILateralCacheJGListener, Serializable
{
private final static Log log =
- LogSource.getInstance( LateralCacheJGListener.class );
+ LogFactory.getFactory().getInstance( LateralCacheJGListener.class );
/**
* Description of the Field
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java
Index: LateralGroupCacheJGListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralGroupCacheJGListener.java 24 Feb 2002 06:15:42 -0000 1.1
+++ LateralGroupCacheJGListener.java 1 Mar 2002 17:46:20 -0000 1.2
@@ -68,7 +68,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManagerFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
@@ -81,7 +81,7 @@
implements ILateralCacheJGListener
{
private final static Log log =
- LogSource.getInstance( LateralGroupCacheJGListener.class );
+ LogFactory.getFactory().getInstance( LateralGroupCacheJGListener.class );
/**
* Constructor for the LateralGroupCacheJGListener object
1.2 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralJGReceiver.java
Index: LateralJGReceiver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralJGReceiver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralJGReceiver.java 24 Feb 2002 06:15:42 -0000 1.1
+++ LateralJGReceiver.java 1 Mar 2002 17:46:20 -0000 1.2
@@ -65,7 +65,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.javagroups.utils.JGRpcOpener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.javagroups.JChannel;
import org.javagroups.Channel;
@@ -78,12 +78,12 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: LateralJGReceiver.java,v 1.1 2002/02/24 06:15:42 asmuts Exp $
+ * @version $Id: LateralJGReceiver.java,v 1.2 2002/03/01 17:46:20 dlr Exp $
*/
public class LateralJGReceiver implements IJGConstants, Runnable
{
private final static Log log =
- LogSource.getInstance( LateralJGReceiver.class );
+ LogFactory.getFactory().getInstance( LateralJGReceiver.class );
private int port;
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java
Index: LateralJGReceiverConnection.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralJGReceiverConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralJGReceiverConnection.java 24 Feb 2002 06:15:42 -0000 1.1
+++ LateralJGReceiverConnection.java 1 Mar 2002 17:46:20 -0000 1.2
@@ -67,7 +67,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.javagroups.behavior.ILateralCacheJGListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.javagroups.Channel;
import org.javagroups.JChannel;
@@ -84,7 +84,7 @@
{
private final static Log log =
- LogSource.getInstance( LateralJGReceiverConnection.class );
+ LogFactory.getFactory().getInstance( LateralJGReceiverConnection.class );
private Channel javagroups;
private Message mes;
1.2 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralJGSender.java
Index: LateralJGSender.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralJGSender.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralJGSender.java 24 Feb 2002 06:15:42 -0000 1.1
+++ LateralJGSender.java 1 Mar 2002 17:46:20 -0000 1.2
@@ -40,7 +40,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.javagroups.behavior.ILateralCacheJGListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This class is based on the log4j SocketAppender class. I'm using a differnet
@@ -48,12 +48,12 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: LateralJGSender.java,v 1.1 2002/02/24 06:15:42 asmuts Exp $
+ * @version $Id: LateralJGSender.java,v 1.2 2002/03/01 17:46:20 dlr Exp $
*/
public class LateralJGSender implements IJGConstants
{
private final static Log log =
- LogSource.getInstance( LateralJGSender.class );
+ LogFactory.getFactory().getInstance( LateralJGSender.class );
private ILateralCacheAttributes ilca;
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralJGService.java
Index: LateralJGService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/LateralJGService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralJGService.java 24 Feb 2002 06:15:42 -0000 1.1
+++ LateralJGService.java 1 Mar 2002 17:46:20 -0000 1.2
@@ -75,7 +75,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* A lateral cache service implementation.
@@ -89,7 +89,7 @@
implements ILateralCacheService, ILateralCacheObserver
{
private final static Log log =
- LogSource.getInstance( LateralJGService.class );
+ LogFactory.getFactory().getInstance( LateralJGService.class );
private ILateralCacheAttributes ilca;
private LateralJGSender sender;
1.3 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/utils/JGRpcOpener.java
Index: JGRpcOpener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/utils/JGRpcOpener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- JGRpcOpener.java 26 Feb 2002 06:03:58 -0000 1.2
+++ JGRpcOpener.java 1 Mar 2002 17:46:21 -0000 1.3
@@ -62,7 +62,7 @@
import org.javagroups.blocks.GroupRequest;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
import org.apache.stratum.jcs.auxiliary.lateral.javagroups.behavior.IJGConstants;
@@ -74,13 +74,13 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: JGRpcOpener.java,v 1.2 2002/02/26 06:03:58 asmuts Exp $
+ * @version $Id: JGRpcOpener.java,v 1.3 2002/03/01 17:46:21 dlr Exp $
*/
public class JGRpcOpener implements Runnable
{
private final static Log log =
- LogSource.getInstance( JGRpcOpener.class );
+ LogFactory.getFactory().getInstance( JGRpcOpener.class );
private String host;
1.4 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java
Index: JGSocketOpener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- JGSocketOpener.java 1 Mar 2002 17:28:59 -0000 1.3
+++ JGSocketOpener.java 1 Mar 2002 17:46:21 -0000 1.4
@@ -60,7 +60,7 @@
import org.javagroups.Channel;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.auxiliary.lateral.javagroups.behavior.IJGConstants;
import org.apache.stratum.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
@@ -71,13 +71,13 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: JGSocketOpener.java,v 1.3 2002/03/01 17:28:59 dlr Exp $
+ * @version $Id: JGSocketOpener.java,v 1.4 2002/03/01 17:46:21 dlr Exp $
*/
public class JGSocketOpener implements Runnable
{
private final static Log log =
- LogSource.getInstance( JGSocketOpener.class );
+ LogFactory.getFactory().getInstance( JGSocketOpener.class );
private ILateralCacheAttributes lca;
1.10 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralCacheTCPListener.java
Index: LateralCacheTCPListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralCacheTCPListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- LateralCacheTCPListener.java 16 Feb 2002 02:37:19 -0000 1.9
+++ LateralCacheTCPListener.java 1 Mar 2002 17:46:21 -0000 1.10
@@ -73,7 +73,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -86,7 +86,7 @@
public class LateralCacheTCPListener implements ILateralCacheTCPListener, Serializable
{
private final static Log log =
- LogSource.getInstance( LateralCacheTCPListener.class );
+ LogFactory.getFactory().getInstance( LateralCacheTCPListener.class );
/** Description of the Field */
protected static transient ICompositeCacheManager cacheMgr;
1.9 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralGroupCacheTCPListener.java
Index: LateralGroupCacheTCPListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralGroupCacheTCPListener.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- LateralGroupCacheTCPListener.java 18 Feb 2002 02:43:10 -0000 1.8
+++ LateralGroupCacheTCPListener.java 1 Mar 2002 17:46:21 -0000 1.9
@@ -68,7 +68,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManagerFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
@@ -81,7 +81,7 @@
implements ILateralCacheTCPListener
{
private final static Log log =
- LogSource.getInstance( LateralGroupCacheTCPListener.class );
+ LogFactory.getFactory().getInstance( LateralGroupCacheTCPListener.class );
/**
* Constructor for the LateralGroupCacheTCPListener object
1.9 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralTCPReceiver.java
Index: LateralTCPReceiver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralTCPReceiver.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- LateralTCPReceiver.java 16 Feb 2002 02:37:19 -0000 1.8
+++ LateralTCPReceiver.java 1 Mar 2002 17:46:21 -0000 1.9
@@ -61,19 +61,19 @@
import org.apache.stratum.jcs.auxiliary.lateral.socket.tcp.behavior.ILateralCacheTCPListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Processes commands from the server socket.
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: LateralTCPReceiver.java,v 1.8 2002/02/16 02:37:19 jtaylor Exp $
+ * @version $Id: LateralTCPReceiver.java,v 1.9 2002/03/01 17:46:21 dlr Exp $
*/
public class LateralTCPReceiver implements Runnable
{
private final static Log log =
- LogSource.getInstance( LateralTCPReceiver.class );
+ LogFactory.getFactory().getInstance( LateralTCPReceiver.class );
private int port;
1.9 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralTCPReceiverConnection.java
Index: LateralTCPReceiverConnection.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralTCPReceiverConnection.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- LateralTCPReceiverConnection.java 16 Feb 2002 02:37:19 -0000 1.8
+++ LateralTCPReceiverConnection.java 1 Mar 2002 17:46:21 -0000 1.9
@@ -66,7 +66,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.socket.tcp.behavior.ILateralCacheTCPListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Separate thread run when a command comes into the LateralTCPReceiver.
@@ -78,7 +78,7 @@
public class LateralTCPReceiverConnection implements Runnable
{
private final static Log log =
- LogSource.getInstance( LateralTCPReceiverConnection.class );
+ LogFactory.getFactory().getInstance( LateralTCPReceiverConnection.class );
private Socket socket;
private ObjectInputStream ois;
1.9 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
Index: LateralTCPSender.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- LateralTCPSender.java 16 Feb 2002 02:37:19 -0000 1.8
+++ LateralTCPSender.java 1 Mar 2002 17:46:21 -0000 1.9
@@ -25,7 +25,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This class is based on the log4j SocketAppender class. I'm using a differnet
@@ -33,12 +33,12 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: LateralTCPSender.java,v 1.8 2002/02/16 02:37:19 jtaylor Exp $
+ * @version $Id: LateralTCPSender.java,v 1.9 2002/03/01 17:46:21 dlr Exp $
*/
public class LateralTCPSender
{
private final static Log log =
- LogSource.getInstance( LateralTCPSender.class );
+ LogFactory.getFactory().getInstance( LateralTCPSender.class );
private ILateralCacheAttributes ilca;
1.9 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
Index: LateralTCPService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- LateralTCPService.java 17 Feb 2002 07:16:24 -0000 1.8
+++ LateralTCPService.java 1 Mar 2002 17:46:21 -0000 1.9
@@ -75,20 +75,20 @@
import org.apache.stratum.jcs.engine.behavior.ICacheListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* A lateral cache service implementation.
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: LateralTCPService.java,v 1.8 2002/02/17 07:16:24 asmuts Exp $
+ * @version $Id: LateralTCPService.java,v 1.9 2002/03/01 17:46:21 dlr Exp $
*/
public class LateralTCPService
implements ILateralCacheService, ILateralCacheObserver
{
private final static Log log =
- LogSource.getInstance( LateralTCPService.class );
+ LogFactory.getFactory().getInstance( LateralTCPService.class );
private ILateralCacheAttributes ilca;
private LateralTCPSender sender;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java
Index: LateralCacheUDPListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- LateralCacheUDPListener.java 16 Feb 2002 02:37:20 -0000 1.5
+++ LateralCacheUDPListener.java 1 Mar 2002 17:46:21 -0000 1.6
@@ -19,7 +19,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
// remove
@@ -32,7 +32,7 @@
public class LateralCacheUDPListener implements ILateralCacheListener, Serializable
{
private final static Log log =
- LogSource.getInstance( LateralCacheUDPListener.class );
+ LogFactory.getFactory().getInstance( LateralCacheUDPListener.class );
/** Description of the Field */
protected static transient ICompositeCacheManager cacheMgr;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralGroupCacheUDPListener.java
Index: LateralGroupCacheUDPListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralGroupCacheUDPListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- LateralGroupCacheUDPListener.java 18 Feb 2002 17:14:23 -0000 1.7
+++ LateralGroupCacheUDPListener.java 1 Mar 2002 17:46:21 -0000 1.8
@@ -22,7 +22,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManagerFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -35,7 +35,7 @@
implements ILateralCacheListener, Serializable
{
private final static Log log =
- LogSource.getInstance( LateralGroupCacheUDPListener.class );
+ LogFactory.getFactory().getInstance( LateralGroupCacheUDPListener.class );
/**
* Constructor for the LateralGroupCacheUDPListener object
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralUDPReceiver.java
Index: LateralUDPReceiver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralUDPReceiver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- LateralUDPReceiver.java 16 Feb 2002 02:37:20 -0000 1.5
+++ LateralUDPReceiver.java 1 Mar 2002 17:46:21 -0000 1.6
@@ -16,7 +16,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.behavior.ILateralCacheListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* A highly unreliable UDP receiver. It is easy to outrun. Uncaught message will
@@ -28,7 +28,7 @@
public class LateralUDPReceiver implements Runnable
{
private final static Log log =
- LogSource.getInstance( LateralUDPReceiver.class );
+ LogFactory.getFactory().getInstance( LateralUDPReceiver.class );
private final byte[] m_buffer = new byte[65536];
private MulticastSocket m_socket;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralUDPSender.java
Index: LateralUDPSender.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralUDPSender.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- LateralUDPSender.java 16 Feb 2002 02:37:20 -0000 1.5
+++ LateralUDPSender.java 1 Mar 2002 17:46:21 -0000 1.6
@@ -25,7 +25,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author asmuts
@@ -34,7 +34,7 @@
public class LateralUDPSender
{
private final static Log log =
- LogSource.getInstance( LateralUDPSender.class );
+ LogFactory.getFactory().getInstance( LateralUDPSender.class );
private MulticastSocket m_localSocket;
private InetAddress m_multicastAddress;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralUDPService.java
Index: LateralUDPService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/socket/udp/LateralUDPService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- LateralUDPService.java 16 Feb 2002 02:37:20 -0000 1.5
+++ LateralUDPService.java 1 Mar 2002 17:46:21 -0000 1.6
@@ -22,7 +22,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -33,7 +33,7 @@
public class LateralUDPService implements ILateralCacheService, ILateralCacheObserver
{
private final static Log log =
- LogSource.getInstance( LateralUDPService.class );
+ LogFactory.getFactory().getInstance( LateralUDPService.class );
private ILateralCacheAttributes ilca;
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java
Index: LateralCacheXMLRPCListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralCacheXMLRPCListener.java 20 Feb 2002 05:30:51 -0000 1.1
+++ LateralCacheXMLRPCListener.java 1 Mar 2002 17:46:22 -0000 1.2
@@ -73,7 +73,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -86,7 +86,7 @@
public class LateralCacheXMLRPCListener implements ILateralCacheXMLRPCListener, Serializable
{
private final static Log log =
- LogSource.getInstance( LateralCacheXMLRPCListener.class );
+ LogFactory.getFactory().getInstance( LateralCacheXMLRPCListener.class );
/** Description of the Field */
protected static transient ICompositeCacheManager cacheMgr;
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralGroupCacheXMLRPCListener.java
Index: LateralGroupCacheXMLRPCListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralGroupCacheXMLRPCListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralGroupCacheXMLRPCListener.java 20 Feb 2002 05:30:51 -0000 1.1
+++ LateralGroupCacheXMLRPCListener.java 1 Mar 2002 17:46:22 -0000 1.2
@@ -68,7 +68,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManagerFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
@@ -81,7 +81,7 @@
implements ILateralCacheXMLRPCListener
{
private final static Log log =
- LogSource.getInstance( LateralGroupCacheXMLRPCListener.class );
+ LogFactory.getFactory().getInstance( LateralGroupCacheXMLRPCListener.class );
/**
* Constructor for the LateralGroupCacheXMLRPCListener object
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCReceiver.java
Index: LateralXMLRPCReceiver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCReceiver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralXMLRPCReceiver.java 20 Feb 2002 05:30:51 -0000 1.1
+++ LateralXMLRPCReceiver.java 1 Mar 2002 17:46:22 -0000 1.2
@@ -63,7 +63,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.xmlrpc.behavior.IXMLRPCConstants;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.xmlrpc.WebServer;
@@ -78,7 +78,7 @@
public class LateralXMLRPCReceiver implements IXMLRPCConstants
{
private final static Log log =
- LogSource.getInstance( LateralXMLRPCReceiver.class );
+ LogFactory.getFactory().getInstance( LateralXMLRPCReceiver.class );
private int port;
1.4 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCReceiverConnection.java
Index: LateralXMLRPCReceiverConnection.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCReceiverConnection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- LateralXMLRPCReceiverConnection.java 26 Feb 2002 06:06:39 -0000 1.3
+++ LateralXMLRPCReceiverConnection.java 1 Mar 2002 17:46:22 -0000 1.4
@@ -70,7 +70,7 @@
import org.apache.stratum.jcs.auxiliary.lateral.xmlrpc.behavior.IXMLRPCConstants;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.xmlrpc.XmlRpcHandler;
@@ -85,7 +85,7 @@
{//implements Runnable
private final static Log log =
- LogSource.getInstance( LateralXMLRPCReceiverConnection.class );
+ LogFactory.getFactory().getInstance( LateralXMLRPCReceiverConnection.class );
private ILateralCacheXMLRPCListener ilcl;
1.4 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCSender.java
Index: LateralXMLRPCSender.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCSender.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- LateralXMLRPCSender.java 26 Feb 2002 06:06:39 -0000 1.3
+++ LateralXMLRPCSender.java 1 Mar 2002 17:46:22 -0000 1.4
@@ -33,7 +33,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This class is based on the log4j SocketAppender class. I'm using a differnet
@@ -41,12 +41,12 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: LateralXMLRPCSender.java,v 1.3 2002/02/26 06:06:39 asmuts Exp $
+ * @version $Id: LateralXMLRPCSender.java,v 1.4 2002/03/01 17:46:22 dlr Exp $
*/
public class LateralXMLRPCSender implements IXMLRPCConstants
{
private final static Log log =
- LogSource.getInstance( LateralXMLRPCSender.class );
+ LogFactory.getFactory().getInstance( LateralXMLRPCSender.class );
private ILateralCacheAttributes ilca;
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java
Index: LateralXMLRPCService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- LateralXMLRPCService.java 20 Feb 2002 05:30:51 -0000 1.1
+++ LateralXMLRPCService.java 1 Mar 2002 17:46:22 -0000 1.2
@@ -75,7 +75,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* A lateral cache service implementation.
@@ -89,7 +89,7 @@
implements ILateralCacheService, ILateralCacheObserver
{
private final static Log log =
- LogSource.getInstance( LateralXMLRPCService.class );
+ LogFactory.getFactory().getInstance( LateralXMLRPCService.class );
private ILateralCacheAttributes ilca;
private LateralXMLRPCSender sender;
1.3 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/utils/XMLRPCSocketOpener.java
Index: XMLRPCSocketOpener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/lateral/xmlrpc/utils/XMLRPCSocketOpener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- XMLRPCSocketOpener.java 24 Feb 2002 08:20:36 -0000 1.2
+++ XMLRPCSocketOpener.java 1 Mar 2002 17:46:22 -0000 1.3
@@ -59,7 +59,7 @@
import org.apache.xmlrpc.XmlRpcClient;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
@@ -68,13 +68,13 @@
*
* @author <a href="mailto:asmuts@yahoo.com">Aaron Smuts</a>
* @created January 15, 2002
- * @version $Id: XMLRPCSocketOpener.java,v 1.2 2002/02/24 08:20:36 asmuts Exp $
+ * @version $Id: XMLRPCSocketOpener.java,v 1.3 2002/03/01 17:46:22 dlr Exp $
*/
public class XMLRPCSocketOpener implements Runnable
{
private final static Log log =
- LogSource.getInstance( XMLRPCSocketOpener.class );
+ LogFactory.getFactory().getInstance( XMLRPCSocketOpener.class );
private String host;
1.12 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCache.java
Index: RemoteCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCache.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- RemoteCache.java 24 Feb 2002 19:18:05 -0000 1.11
+++ RemoteCache.java 1 Mar 2002 17:46:22 -0000 1.12
@@ -17,7 +17,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheElement;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.engine.behavior.IZombie;
@@ -30,7 +30,7 @@
public class RemoteCache implements ICache
{
private final static Log log =
- LogSource.getInstance( RemoteCache.class );
+ LogFactory.getFactory().getInstance( RemoteCache.class );
private static int numCreated = 0;
1.7 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheFactory.java
Index: RemoteCacheFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- RemoteCacheFactory.java 16 Feb 2002 02:37:20 -0000 1.6
+++ RemoteCacheFactory.java 1 Mar 2002 17:46:22 -0000 1.7
@@ -13,7 +13,7 @@
import org.apache.stratum.jcs.engine.behavior.ICache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -24,7 +24,7 @@
public class RemoteCacheFactory implements IAuxiliaryCacheFactory
{
private final static Log log =
- LogSource.getInstance( RemoteCacheFactory.class );
+ LogFactory.getFactory().getInstance( RemoteCacheFactory.class );
private static String name;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
Index: RemoteCacheFailoverRunner.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheFailoverRunner.java 16 Feb 2002 02:37:20 -0000 1.5
+++ RemoteCacheFailoverRunner.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -3,7 +3,7 @@
import org.apache.stratum.jcs.engine.behavior.ICache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -14,7 +14,7 @@
public class RemoteCacheFailoverRunner implements Runnable
{
private final static Log log =
- LogSource.getInstance( RemoteCacheFailoverRunner.class );
+ LogFactory.getFactory().getInstance( RemoteCacheFailoverRunner.class );
private RemoteCacheNoWaitFacade facade;
1.9 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheListener.java
Index: RemoteCacheListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheListener.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- RemoteCacheListener.java 16 Feb 2002 02:37:20 -0000 1.8
+++ RemoteCacheListener.java 1 Mar 2002 17:46:22 -0000 1.9
@@ -23,7 +23,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
// remove
@@ -38,7 +38,7 @@
implements IRemoteCacheListener, IRemoteCacheConstants, Serializable
{
private final static Log log =
- LogSource.getInstance( RemoteCacheListener.class );
+ LogFactory.getFactory().getInstance( RemoteCacheListener.class );
/** Description of the Field */
protected static transient ICompositeCacheManager cacheMgr;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheManager.java
Index: RemoteCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheManager.java 16 Feb 2002 02:37:20 -0000 1.5
+++ RemoteCacheManager.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -30,7 +30,7 @@
import org.apache.stratum.jcs.engine.CacheWatchRepairable;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* An instance of RemoteCacheManager corresponds to one remote connection of a
@@ -44,7 +44,7 @@
public class RemoteCacheManager implements IAuxiliaryCacheManager
{
private final static Log log =
- LogSource.getInstance( RemoteCacheManager.class );
+ LogFactory.getFactory().getInstance( RemoteCacheManager.class );
// Contains mappings of Location instance to RemoteCacheManager instance.
final static Map instances = new HashMap();
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheMonitor.java
Index: RemoteCacheMonitor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheMonitor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheMonitor.java 16 Feb 2002 02:37:20 -0000 1.5
+++ RemoteCacheMonitor.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -7,7 +7,7 @@
import org.apache.stratum.jcs.auxiliary.remote.RemoteCacheRestore;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Used to monitor and repair any failed connection for the remote cache
@@ -24,7 +24,7 @@
public class RemoteCacheMonitor implements Runnable
{
private final static Log log =
- LogSource.getInstance( RemoteCacheMonitor.class );
+ LogFactory.getFactory().getInstance( RemoteCacheMonitor.class );
private static RemoteCacheMonitor instance;
private static long idlePeriod = 30 * 1000;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheNoWait.java
Index: RemoteCacheNoWait.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheNoWait.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- RemoteCacheNoWait.java 24 Feb 2002 19:18:05 -0000 1.7
+++ RemoteCacheNoWait.java 1 Mar 2002 17:46:22 -0000 1.8
@@ -18,7 +18,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheType;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Used to queue up update requests to the underlying cache. These requests will
@@ -30,7 +30,7 @@
public class RemoteCacheNoWait implements ICache
{
private final static Log log =
- LogSource.getInstance( RemoteCacheNoWait.class );
+ LogFactory.getFactory().getInstance( RemoteCacheNoWait.class );
private final RemoteCache cache;
private ICacheEventQueue q;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
Index: RemoteCacheNoWaitFacade.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- RemoteCacheNoWaitFacade.java 24 Feb 2002 19:18:05 -0000 1.7
+++ RemoteCacheNoWaitFacade.java 1 Mar 2002 17:46:22 -0000 1.8
@@ -11,7 +11,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheType;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Used to provide access to multiple services under nowait protection. factory
@@ -24,7 +24,7 @@
public class RemoteCacheNoWaitFacade implements ICache
{
private final static Log log =
- LogSource.getInstance( RemoteCacheNoWaitFacade.class );
+ LogFactory.getFactory().getInstance( RemoteCacheNoWaitFacade.class );
/** Description of the Field */
public RemoteCacheNoWait[] noWaits;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheRestore.java
Index: RemoteCacheRestore.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteCacheRestore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheRestore.java 16 Feb 2002 02:37:20 -0000 1.5
+++ RemoteCacheRestore.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -9,7 +9,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheRestore;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Used to repair the remote caches managed by the associated instance of
@@ -26,7 +26,7 @@
public class RemoteCacheRestore implements ICacheRestore
{
private final static Log log =
- LogSource.getInstance( RemoteCacheRestore.class );
+ LogFactory.getFactory().getInstance( RemoteCacheRestore.class );
private final RemoteCacheManager rcm;
//private final IAuxiliaryCacheManager rcm;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteUtils.java
Index: RemoteUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/RemoteUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteUtils.java 16 Feb 2002 02:37:20 -0000 1.5
+++ RemoteUtils.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -13,7 +13,7 @@
import java.util.Properties;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -24,7 +24,7 @@
public class RemoteUtils
{
private final static Log log =
- LogSource.getInstance( RemoteUtils.class );
+ LogFactory.getFactory().getInstance( RemoteUtils.class );
/** Constructor for the RemoteUtils object */
private RemoteUtils() { }
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/group/RemoteGroupCacheListener.java
Index: RemoteGroupCacheListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/group/RemoteGroupCacheListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- RemoteGroupCacheListener.java 18 Feb 2002 02:43:09 -0000 1.7
+++ RemoteGroupCacheListener.java 1 Mar 2002 17:46:22 -0000 1.8
@@ -35,7 +35,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManagerFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
// remove
@@ -48,7 +48,7 @@
public class RemoteGroupCacheListener extends RemoteCacheListener implements IRemoteCacheListener, IRemoteCacheConstants, Serializable
{
private final static Log log =
- LogSource.getInstance( RemoteGroupCacheListener.class );
+ LogFactory.getFactory().getInstance( RemoteGroupCacheListener.class );
/**
* Constructor for the RemoteGroupCacheListener object
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheClusterFactory.java
Index: RemoteCacheClusterFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheClusterFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheClusterFactory.java 16 Feb 2002 02:37:21 -0000 1.5
+++ RemoteCacheClusterFactory.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -17,7 +17,7 @@
import org.apache.stratum.jcs.engine.behavior.ICache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -28,7 +28,7 @@
public class RemoteCacheClusterFactory implements IAuxiliaryCacheFactory
{
private final static Log log =
- LogSource.getInstance( RemoteCacheClusterFactory.class );
+ LogFactory.getFactory().getInstance( RemoteCacheClusterFactory.class );
private static String name;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheClusterManager.java
Index: RemoteCacheClusterManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheClusterManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheClusterManager.java 16 Feb 2002 02:37:21 -0000 1.5
+++ RemoteCacheClusterManager.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -27,7 +27,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* @author asmuts
@@ -36,7 +36,7 @@
public class RemoteCacheClusterManager implements ICacheManager
{
private final static Log log =
- LogSource.getInstance( RemoteCacheClusterManager.class );
+ LogFactory.getFactory().getInstance( RemoteCacheClusterManager.class );
// Contains mappings of Location instance to RemoteCacheManager instance.
final static Map instances = new HashMap();
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheClusterMonitor.java
Index: RemoteCacheClusterMonitor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheClusterMonitor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheClusterMonitor.java 16 Feb 2002 02:37:21 -0000 1.5
+++ RemoteCacheClusterMonitor.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -8,7 +8,7 @@
import org.apache.stratum.jcs.auxiliary.remote.server.RemoteCacheClusterRestore;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Used to monitor and repair any failed connection for the remote cache
@@ -24,7 +24,7 @@
public class RemoteCacheClusterMonitor implements Runnable
{
private final static Log log =
- LogSource.getInstance( RemoteCacheClusterMonitor.class );
+ LogFactory.getFactory().getInstance( RemoteCacheClusterMonitor.class );
private static RemoteCacheClusterMonitor instance;
private static long idlePeriod = 30 * 1000;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheClusterRestore.java
Index: RemoteCacheClusterRestore.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheClusterRestore.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheClusterRestore.java 16 Feb 2002 02:37:21 -0000 1.5
+++ RemoteCacheClusterRestore.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -9,7 +9,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheRestore;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
// may not be necessary. cloning the remote cache framework for the cluster
// connections. may be able to use old, but it is probably better to move away
@@ -28,7 +28,7 @@
public class RemoteCacheClusterRestore implements ICacheRestore
{
private final static Log log =
- LogSource.getInstance( RemoteCacheClusterRestore.class );
+ LogFactory.getFactory().getInstance( RemoteCacheClusterRestore.class );
private final RemoteCacheClusterManager rcm;
//private final IAuxiliaryCacheManager rcm;
1.9 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheServer.java
Index: RemoteCacheServer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- RemoteCacheServer.java 16 Feb 2002 02:37:21 -0000 1.8
+++ RemoteCacheServer.java 1 Mar 2002 17:46:22 -0000 1.9
@@ -38,7 +38,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Provides remote cache services.
@@ -52,7 +52,7 @@
IRemoteCacheServiceAdmin, Unreferenced
{
private final static Log log =
- LogSource.getInstance( RemoteCacheServer.class );
+ LogFactory.getFactory().getInstance( RemoteCacheServer.class );
/** Description of the Field */
protected final static boolean timing = true;
1.7 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
Index: RemoteCacheServerFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- RemoteCacheServerFactory.java 16 Feb 2002 02:37:21 -0000 1.6
+++ RemoteCacheServerFactory.java 1 Mar 2002 17:46:22 -0000 1.7
@@ -19,7 +19,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheServiceAdmin;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Provides remote cache services.
@@ -31,7 +31,7 @@
implements IRemoteCacheConstants
{
private final static Log log =
- LogSource.getInstance( RemoteCacheServerFactory.class );
+ LogFactory.getFactory().getInstance( RemoteCacheServerFactory.class );
/** The single instance of the RemoteCacheServer object. */
private static RemoteCacheServer instance;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheServerListener.java
Index: RemoteCacheServerListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/RemoteCacheServerListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- RemoteCacheServerListener.java 16 Feb 2002 02:37:21 -0000 1.5
+++ RemoteCacheServerListener.java 1 Mar 2002 17:46:22 -0000 1.6
@@ -23,7 +23,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
// remove
@@ -37,7 +37,7 @@
implements IRemoteCacheListener, IRemoteCacheConstants, Serializable
{
private final static Log log =
- LogSource.getInstance( RemoteCacheServerListener.class );
+ LogFactory.getFactory().getInstance( RemoteCacheServerListener.class );
/** Description of the Field */
protected static transient ICompositeCacheManager cacheMgr;
1.9 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/group/RemoteGroupCacheServerFactory.java
Index: RemoteGroupCacheServerFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/auxiliary/remote/server/group/RemoteGroupCacheServerFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- RemoteGroupCacheServerFactory.java 16 Feb 2002 02:37:21 -0000 1.8
+++ RemoteGroupCacheServerFactory.java 1 Mar 2002 17:46:23 -0000 1.9
@@ -19,7 +19,7 @@
import org.apache.stratum.jcs.auxiliary.remote.server.RemoteCacheServerAttributes;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Provides remote session cache services.
@@ -31,7 +31,7 @@
implements IRemoteCacheConstants
{
private final static Log log =
- LogSource.getInstance( RemoteGroupCacheServerFactory.class );
+ LogFactory.getFactory().getInstance( RemoteGroupCacheServerFactory.class );
/** The single instance of the RemoteGroupCacheServer object. */
private static RemoteGroupCacheServer instance;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/config/OptionConverter.java
Index: OptionConverter.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/config/OptionConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- OptionConverter.java 16 Feb 2002 02:37:21 -0000 1.5
+++ OptionConverter.java 1 Mar 2002 17:46:23 -0000 1.6
@@ -3,7 +3,7 @@
import java.util.Properties;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This class is based on the log4j class
@@ -18,7 +18,7 @@
public class OptionConverter
{
private final static Log log =
- LogSource.getInstance( OptionConverter.class );
+ LogFactory.getFactory().getInstance( OptionConverter.class );
static String DELIM_START = "${";
static char DELIM_STOP = '}';
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/config/PropertySetter.java
Index: PropertySetter.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/config/PropertySetter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- PropertySetter.java 16 Feb 2002 02:37:21 -0000 1.5
+++ PropertySetter.java 1 Mar 2002 17:46:23 -0000 1.6
@@ -14,7 +14,7 @@
import org.apache.stratum.jcs.config.PropertySetterException;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This class is based on the log4j class org.apache.log4j.config.PropertySetter
@@ -46,7 +46,7 @@
public class PropertySetter
{
private final static Log log =
- LogSource.getInstance( OptionConverter.class );
+ LogFactory.getFactory().getInstance( OptionConverter.class );
/** Description of the Field */
protected Object obj;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/CacheAdaptor.java
Index: CacheAdaptor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/CacheAdaptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- CacheAdaptor.java 16 Feb 2002 02:37:22 -0000 1.5
+++ CacheAdaptor.java 1 Mar 2002 17:46:23 -0000 1.6
@@ -8,7 +8,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheListener;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Used for Cache-to-Cache messaging purposes.
@@ -18,7 +18,7 @@
*/
public class CacheAdaptor implements ICacheListener
{
- private final static Log log = LogSource.getInstance( CacheAdaptor.class );
+ private final static Log log = LogFactory.getFactory().getInstance( CacheAdaptor.class );
private final ICache cache;
1.10 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/CacheEventQueue.java
Index: CacheEventQueue.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/CacheEventQueue.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- CacheEventQueue.java 25 Feb 2002 01:52:28 -0000 1.9
+++ CacheEventQueue.java 1 Mar 2002 17:46:23 -0000 1.10
@@ -10,7 +10,7 @@
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* An event queue is used to propagate ordered cache events to one and only one
@@ -18,7 +18,7 @@
*/
public class CacheEventQueue implements ICacheEventQueue
{
- private final static Log log = LogSource.getInstance( CacheEventQueue.class );
+ private final static Log log = LogFactory.getFactory().getInstance( CacheEventQueue.class );
private static int processorInstanceCount = 0;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/CacheWatchRepairable.java
Index: CacheWatchRepairable.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/CacheWatchRepairable.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- CacheWatchRepairable.java 16 Feb 2002 02:37:22 -0000 1.5
+++ CacheWatchRepairable.java 1 Mar 2002 17:46:23 -0000 1.6
@@ -14,7 +14,7 @@
import org.apache.stratum.jcs.engine.behavior.ICacheObserver;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Interceps the requests to the underlying ICacheObserver object so that the
@@ -28,7 +28,7 @@
public class CacheWatchRepairable implements ICacheObserver
{
private final static Log log =
- LogSource.getInstance( CacheWatchRepairable.class );
+ LogFactory.getFactory().getInstance( CacheWatchRepairable.class );
// the underlying ICacheObserver.
private ICacheObserver cacheWatch;
1.21 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/Cache.java
Index: Cache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/Cache.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -u -r1.20 -r1.21
--- Cache.java 24 Feb 2002 19:18:05 -0000 1.20
+++ Cache.java 1 Mar 2002 17:46:23 -0000 1.21
@@ -79,7 +79,7 @@
import org.apache.stratum.jcs.engine.memory.lru.LRUMemoryCache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This is the primary cache hub. It control the flow of items through the
@@ -91,7 +91,7 @@
public class Cache
implements ICacheHub, ICache, ICompositeCache, Serializable
{
- private final static Log log = LogSource.getInstance( Cache.class );
+ private final static Log log = LogFactory.getFactory().getInstance( Cache.class );
/**
* not used for much
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/CacheManagerFactory.java
Index: CacheManagerFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/CacheManagerFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- CacheManagerFactory.java 16 Feb 2002 02:37:23 -0000 1.5
+++ CacheManagerFactory.java 1 Mar 2002 17:46:23 -0000 1.6
@@ -1,13 +1,13 @@
package org.apache.stratum.jcs.engine.control;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** */
public abstract class CacheManagerFactory
{
private final static Log log =
- LogSource.getInstance( CacheManagerFactory.class );
+ LogFactory.getFactory().getInstance( CacheManagerFactory.class );
private static CompositeCacheManager instance;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/CompositeCacheConfigurator.java
Index: CompositeCacheConfigurator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/CompositeCacheConfigurator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- CompositeCacheConfigurator.java 21 Feb 2002 06:42:53 -0000 1.7
+++ CompositeCacheConfigurator.java 1 Mar 2002 17:46:23 -0000 1.8
@@ -22,7 +22,7 @@
import org.apache.stratum.jcs.engine.behavior.ICompositeCacheAttributes;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This class is based on the log4j class org.apache.log4j.PropertyConfigurator
@@ -35,7 +35,7 @@
public class CompositeCacheConfigurator
{
private final static Log log =
- LogSource.getInstance( CompositeCacheConfigurator.class );
+ LogFactory.getFactory().getInstance( CompositeCacheConfigurator.class );
final static String DEFAULT_REGION = "jcs.default";
final static String REGION_PREFIX = "jcs.region.";
1.10 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/CompositeCacheManager.java
Index: CompositeCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/CompositeCacheManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- CompositeCacheManager.java 21 Feb 2002 06:42:53 -0000 1.9
+++ CompositeCacheManager.java 1 Mar 2002 17:46:23 -0000 1.10
@@ -28,14 +28,14 @@
import org.apache.stratum.jcs.engine.behavior.ICompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** Manages a composite cache. */
public class CompositeCacheManager
implements ICompositeCacheManager, IRemoteCacheConstants, Serializable
{
private final static Log log =
- LogSource.getInstance( CompositeCacheManager.class );
+ LogFactory.getFactory().getInstance( CompositeCacheManager.class );
/** Caches managed by this cache manager */
protected Hashtable caches = new Hashtable();
1.5 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/group/GroupCache.java
Index: GroupCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/group/GroupCache.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- GroupCache.java 18 Feb 2002 17:14:24 -0000 1.4
+++ GroupCache.java 1 Mar 2002 17:46:23 -0000 1.5
@@ -84,7 +84,7 @@
import org.apache.stratum.jcs.utils.locking.ReadWriteLockManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Group cache is basically a composite cache with the additional capability of
@@ -99,7 +99,7 @@
*/
public class GroupCache extends Cache implements ICompositeCache
{
- private final static Log log = LogSource.getInstance( GroupCache.class );
+ private final static Log log = LogFactory.getFactory().getInstance( GroupCache.class );
/** Manages locking for group item manipulation. */
private ReadWriteLockManager locker = GroupRWLockManager.getInstance();
1.5 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/group/GroupCacheManager.java
Index: GroupCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/group/GroupCacheManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- GroupCacheManager.java 18 Feb 2002 17:14:24 -0000 1.4
+++ GroupCacheManager.java 1 Mar 2002 17:46:23 -0000 1.5
@@ -12,7 +12,7 @@
import org.apache.stratum.jcs.engine.control.CompositeCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** */
public class GroupCacheManager
@@ -20,7 +20,7 @@
implements Serializable
{
private final static Log log =
- LogSource.getInstance( CompositeCacheManager.class );
+ LogFactory.getFactory().getInstance( CompositeCacheManager.class );
private static GroupCacheManager instance;
1.4 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/group/GroupCacheManagerFactory.java
Index: GroupCacheManagerFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/group/GroupCacheManagerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- GroupCacheManagerFactory.java 18 Feb 2002 05:10:43 -0000 1.3
+++ GroupCacheManagerFactory.java 1 Mar 2002 17:46:23 -0000 1.4
@@ -5,13 +5,13 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/** */
public abstract class GroupCacheManagerFactory
{
private final static Log log =
- LogSource.getInstance( GroupCacheManagerFactory.class );
+ LogFactory.getFactory().getInstance( GroupCacheManagerFactory.class );
private static GroupCacheManager instance;
1.4 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/group/GroupRWLockManager.java
Index: GroupRWLockManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/control/group/GroupRWLockManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- GroupRWLockManager.java 18 Feb 2002 05:10:43 -0000 1.3
+++ GroupRWLockManager.java 1 Mar 2002 17:46:23 -0000 1.4
@@ -5,7 +5,7 @@
import org.apache.stratum.jcs.utils.locking.ReadWriteLockManager;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* The ReadWriteLock Manager for distributed group list management.
@@ -16,7 +16,7 @@
class GroupRWLockManager extends ReadWriteLockManager
{
private final static Log log =
- LogSource.getInstance( GroupRWLockManager.class );
+ LogFactory.getFactory().getInstance( GroupRWLockManager.class );
/** Description of the Field */
private static GroupRWLockManager instance;
1.14 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/memory/lru/LRUMemoryCache.java
Index: LRUMemoryCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/memory/lru/LRUMemoryCache.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- LRUMemoryCache.java 24 Feb 2002 19:18:05 -0000 1.13
+++ LRUMemoryCache.java 1 Mar 2002 17:46:24 -0000 1.14
@@ -26,7 +26,7 @@
import org.apache.stratum.jcs.engine.memory.behavior.IMemoryCache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* A fast reference management system. The least recently used items move to the
@@ -45,7 +45,7 @@
public class LRUMemoryCache implements IMemoryCache, ICache, Serializable
{
private final static Log log =
- LogSource.getInstance( LRUMemoryCache.class );
+ LogFactory.getFactory().getInstance( LRUMemoryCache.class );
// MOVE TO MEMORYMANAGER
String cacheName;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/memory/mru/MRUMemoryCache.java
Index: MRUMemoryCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/memory/mru/MRUMemoryCache.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- MRUMemoryCache.java 24 Feb 2002 19:18:05 -0000 1.7
+++ MRUMemoryCache.java 1 Mar 2002 17:46:24 -0000 1.8
@@ -27,7 +27,7 @@
import org.apache.stratum.jcs.engine.memory.behavior.IMemoryCache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* A SLOW AS HELL reference management system. The most recently used items move
@@ -41,7 +41,7 @@
implements IMemoryCache, ICache, Serializable
{
private final static Log log =
- LogSource.getInstance( MRUMemoryCache.class );
+ LogFactory.getFactory().getInstance( MRUMemoryCache.class );
// MOVE TO MEMORYMANAGER
String cacheName;
1.4 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/memory/shrinking/ShrinkerThread.java
Index: ShrinkerThread.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/memory/shrinking/ShrinkerThread.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- ShrinkerThread.java 19 Feb 2002 04:46:54 -0000 1.3
+++ ShrinkerThread.java 1 Mar 2002 17:46:24 -0000 1.4
@@ -60,7 +60,7 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.engine.memory.MemoryElementDescriptor;
import org.apache.stratum.jcs.engine.memory.behavior.IMemoryCache;
@@ -79,7 +79,7 @@
boolean alive = true;
private final static Log log =
- LogSource.getInstance( ShrinkerThread.class );
+ LogFactory.getFactory().getInstance( ShrinkerThread.class );
/**
1.5 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/memory/shrinking/ShrinkingMemoryCache.java
Index: ShrinkingMemoryCache.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/engine/memory/shrinking/ShrinkingMemoryCache.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- ShrinkingMemoryCache.java 24 Feb 2002 19:18:05 -0000 1.4
+++ ShrinkingMemoryCache.java 1 Mar 2002 17:46:24 -0000 1.5
@@ -24,7 +24,7 @@
import org.apache.stratum.jcs.engine.memory.behavior.IMemoryCache;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This is mainly intended as a tester for the ShrinkerThread
@@ -35,7 +35,7 @@
public class ShrinkingMemoryCache implements IMemoryCache, ICache, Serializable
{
private final static Log log =
- LogSource.getInstance( ShrinkingMemoryCache.class );
+ LogFactory.getFactory().getInstance( ShrinkingMemoryCache.class );
// MOVE TO MEMORYMANAGER
String cacheName;
1.8 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/test/servlet/ListTestCacheServlet.java
Index: ListTestCacheServlet.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/test/servlet/ListTestCacheServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- ListTestCacheServlet.java 18 Feb 2002 02:43:09 -0000 1.7
+++ ListTestCacheServlet.java 1 Mar 2002 17:46:24 -0000 1.8
@@ -36,7 +36,7 @@
import org.apache.stratum.jcs.engine.control.group.GroupCacheManagerFactory;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -47,7 +47,7 @@
public class ListTestCacheServlet extends HttpServlet
{
private final static Log log =
- LogSource.getInstance( ListTestCacheServlet.class );
+ LogFactory.getFactory().getInstance( ListTestCacheServlet.class );
/** Description of the Field */
protected static GroupCacheManager cacheMgr;
1.5 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/test/servlet/SessionExampleServlet.java
Index: SessionExampleServlet.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/test/servlet/SessionExampleServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- SessionExampleServlet.java 16 Feb 2002 02:37:23 -0000 1.4
+++ SessionExampleServlet.java 1 Mar 2002 17:46:24 -0000 1.5
@@ -63,7 +63,7 @@
import org.apache.stratum.jcs.utils.servlet.session.HttpServletRequestFacade;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Session example using the cache for session replicaiton. Modifed from Tomcat
@@ -77,7 +77,7 @@
public class SessionExampleServlet extends HttpServlet
{
private final static Log log =
- LogSource.getInstance( SessionExampleServlet.class );
+ LogFactory.getFactory().getInstance( SessionExampleServlet.class );
ResourceBundle rb = ResourceBundle.getBundle( "LocalStrings" );
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/config/IUtilConstants.java
Index: IUtilConstants.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/config/IUtilConstants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- IUtilConstants.java 16 Feb 2002 02:37:23 -0000 1.5
+++ IUtilConstants.java 1 Mar 2002 17:46:24 -0000 1.6
@@ -7,7 +7,7 @@
import java.util.Properties;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Interface
@@ -32,7 +32,7 @@
final static class Config
{
private final static Log log =
- LogSource.getInstance( Config.class );
+ LogFactory.getFactory().getInstance( Config.class );
private final static String ADMIN_USERID;
private final static String ADMIN_PASSWORD;
1.5 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/locking/ReadWriteLock.java
Index: ReadWriteLock.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/locking/ReadWriteLock.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- ReadWriteLock.java 25 Feb 2002 01:52:28 -0000 1.4
+++ ReadWriteLock.java 1 Mar 2002 17:46:24 -0000 1.5
@@ -4,7 +4,7 @@
import java.util.ArrayList;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* This class coordinates concurrent calls to an object's get and set methods so
@@ -24,7 +24,7 @@
public class ReadWriteLock
{
private final static Log log =
- LogSource.getInstance( ReadWriteLock.class );
+ LogFactory.getFactory().getInstance( ReadWriteLock.class );
/** Number of threads waiting to read. */
private int waitingForReadLock = 0;
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/locking/ReadWriteLockManager.java
Index: ReadWriteLockManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/locking/ReadWriteLockManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- ReadWriteLockManager.java 16 Feb 2002 19:06:35 -0000 1.1
+++ ReadWriteLockManager.java 1 Mar 2002 17:46:24 -0000 1.2
@@ -3,7 +3,7 @@
import java.util.Hashtable;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* The Generic ReadWriteLock Manager for various resources.
@@ -14,7 +14,7 @@
public abstract class ReadWriteLockManager
{
private final static Log log =
- LogSource.getInstance( ReadWriteLockManager.class );
+ LogFactory.getFactory().getInstance( ReadWriteLockManager.class );
/**
* Used to asynchronously remove unused RwLockHolder objects managed ty this
1.2 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/locking/RwLockGC.java
Index: RwLockGC.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/locking/RwLockGC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- RwLockGC.java 16 Feb 2002 19:06:35 -0000 1.1
+++ RwLockGC.java 1 Mar 2002 17:46:24 -0000 1.2
@@ -7,7 +7,7 @@
import java.util.Map.Entry;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.utils.locking.RwLockHolder;
@@ -20,7 +20,7 @@
*/
public class RwLockGC extends Thread
{
- private final static Log log = LogSource.getInstance( RwLockGC.class );
+ private final static Log log = LogFactory.getFactory().getInstance( RwLockGC.class );
private final Hashtable ht;
private final static long IDLE_PERIOD = 60 * 1000;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/BasicHttpAuthenticator.java
Index: BasicHttpAuthenticator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/BasicHttpAuthenticator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- BasicHttpAuthenticator.java 16 Feb 2002 02:37:25 -0000 1.5
+++ BasicHttpAuthenticator.java 1 Mar 2002 17:46:24 -0000 1.6
@@ -10,7 +10,7 @@
import org.apache.stratum.jcs.utils.config.IUtilConstants;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import sun.misc.BASE64Decoder;
@@ -23,7 +23,7 @@
public class BasicHttpAuthenticator
{
private final static Log log =
- LogSource.getInstance( BasicHttpAuthenticator.class );
+ LogFactory.getFactory().getInstance( BasicHttpAuthenticator.class );
/** Contains the "WWW-Authenticate" http response header. */
private final String wwwAuthHeader;
1.10 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/session/DistSession.java
Index: DistSession.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/session/DistSession.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- DistSession.java 18 Feb 2002 17:14:25 -0000 1.9
+++ DistSession.java 1 Mar 2002 17:46:24 -0000 1.10
@@ -14,7 +14,7 @@
import org.apache.stratum.jcs.access.GroupCacheAccess;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* DistSession uses the CompositeCache and GroupCache to create a failover-safe
@@ -28,7 +28,7 @@
implements HttpSession, ISessionConstants
{
private final static Log log =
- LogSource.getInstance( DistSession.class );
+ LogFactory.getFactory().getInstance( DistSession.class );
private static boolean SET_ATTR_INVOCATION = true;
private static boolean REMOVE_ATTR_INVOCATION = false;
1.7 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/session/DistSessionGC.java
Index: DistSessionGC.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/session/DistSessionGC.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- DistSessionGC.java 16 Feb 2002 02:37:25 -0000 1.6
+++ DistSessionGC.java 1 Mar 2002 17:46:24 -0000 1.7
@@ -4,7 +4,7 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.utils.servlet.session.DistSession;
import org.apache.stratum.jcs.utils.servlet.session.ISessionConstants;
@@ -18,7 +18,7 @@
class DistSessionGC extends Thread implements ISessionConstants
{
private final static Log log =
- LogSource.getInstance( DistSessionGC.class );
+ LogFactory.getFactory().getInstance( DistSessionGC.class );
private final static long IDLE_PERIOD = DFLT_INACTIVE_INTERVAL;
private final Set sessIdSet;
1.6 +2 -2 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/session/DistSessionPoolManager.java
Index: DistSessionPoolManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/session/DistSessionPoolManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- DistSessionPoolManager.java 16 Feb 2002 02:37:25 -0000 1.5
+++ DistSessionPoolManager.java 1 Mar 2002 17:46:24 -0000 1.6
@@ -1,7 +1,7 @@
package org.apache.stratum.jcs.utils.servlet.session;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* Description of the Class
@@ -12,7 +12,7 @@
public class DistSessionPoolManager
{
private final static Log log =
- LogSource.getInstance( DistSessionPoolManager.class );
+ LogFactory.getFactory().getInstance( DistSessionPoolManager.class );
DistSession[] pool;
boolean[] inUse;
1.7 +3 -3 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/session/DistSessionTracker.java
Index: DistSessionTracker.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/servlet/session/DistSessionTracker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- DistSessionTracker.java 16 Feb 2002 02:37:25 -0000 1.6
+++ DistSessionTracker.java 1 Mar 2002 17:46:25 -0000 1.7
@@ -10,7 +10,7 @@
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratum.jcs.utils.servlet.session.DistSession;
import org.apache.stratum.jcs.utils.servlet.session.DistSessionGC;
@@ -23,13 +23,13 @@
*
* @author Aaron Smuts
* @created January 15, 2002
- * @version $Revision: 1.6 $ $Date: 2002/02/16 02:37:25 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/01 17:46:25 $
*/
public class DistSessionTracker implements ISessionConstants
{
private final static Log log =
- LogSource.getInstance( DistSessionTracker.class );
+ LogFactory.getFactory().getInstance( DistSessionTracker.class );
/** Description of the Field */
public final static String SESSION_COOKIE_NAME = "SESSION_ID";
1.6 +5 -5 jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/threads/ThreadPool.java
Index: ThreadPool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/threads/ThreadPool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- ThreadPool.java 16 Feb 2002 19:06:35 -0000 1.5
+++ ThreadPool.java 1 Mar 2002 17:46:25 -0000 1.6
@@ -1,9 +1,9 @@
package org.apache.stratum.jcs.utils.threads;
/*
- * $Header: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/threads/ThreadPool.java,v 1.5 2002/02/16 19:06:35 jtaylor Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/16 19:06:35 $
+ * $Header: /home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/jcs/utils/threads/ThreadPool.java,v 1.6 2002/03/01 17:46:25 dlr Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/03/01 17:46:25 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
import java.io.*;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
+import org.apache.commons.logging.LogFactory;
/**
* A thread pool that is trying to copy the apache process management. asmuts --
@@ -82,7 +82,7 @@
public class ThreadPool
{
private final static Log log =
- LogSource.getInstance( ThreadPool.class );
+ LogFactory.getFactory().getInstance( ThreadPool.class );
/*
* Default values ...
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>