Author: asmuts
Date: Fri Feb 3 14:37:10 2006
New Revision: 374766
URL: http://svn.apache.org/viewcvs?rev=374766&view=rev
Log:
cleaning up style problems
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractManager.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAttributes.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheInfo.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWait.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheWatchRepairable.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralElementDescriptor.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheService.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheWatch.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/TCPLateralCacheAttributes.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/UDPDiscoveryMessage.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/utils/SocketOpener.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCache.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheAttributes.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheInfo.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheManager.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheMonitor.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheObserver.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheServiceAdmin.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerAttributes.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/AbstractAuxiliaryCacheAttributes.java
Fri Feb 3 14:37:10 2006
@@ -10,12 +10,24 @@
implements AuxiliaryCacheAttributes
{
+ /**
+ * cacheName
+ */
protected String cacheName;
+ /**
+ * name
+ */
protected String name;
+ /**
+ * eventQueueType -- pooled or single threaded
+ */
protected int eventQueueType;
+ /**
+ * Named when pooled
+ */
protected String eventQueuePoolName;
/*
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCache.java
Fri Feb 3 14:37:10 2006
@@ -39,6 +39,8 @@
public class LateralCache
implements ICache
{
+ private static final long serialVersionUID = 6274549256562382782L;
+
private final static Log log = LogFactory.getLog( LateralCache.class );
// generalize this, use another interface
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractFactory.java
Fri Feb 3 14:37:10 2006
@@ -52,7 +52,7 @@
* <p>
* This should be called by create cache.
*
- * @param lac, LateralCacheAttributes
+ * @param lac LateralCacheAttributes
* @param cacheMgr
*/
public abstract void createListener( LateralCacheAttributes lac,
ICompositeCacheManager cacheMgr );
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractManager.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractManager.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAbstractManager.java
Fri Feb 3 14:37:10 2006
@@ -33,7 +33,7 @@
/**
* Creates lateral caches. Lateral caches are primarily used for removing non
* laterally configured caches. Non laterally configured cache regions should
- * still bea ble to participate in removal. But if there is a non laterally
+ * still be able to participate in removal. But if there is a non laterally
* configured cache hub, then lateral removals may be necessary. For flat
* webserver production environments, without a strong machine at the app
server
* level, distribution and search may need to occur at the lateral cache level.
@@ -48,7 +48,9 @@
{
private final static Log log = LogFactory.getLog(
LateralCacheAbstractManager.class );
- // each manager instance has caches
+ /**
+ * Each manager instance has caches.
+ */
protected final Map caches = new HashMap();
/**
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAttributes.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAttributes.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAttributes.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheAttributes.java
Fri Feb 3 14:37:10 2006
@@ -31,7 +31,9 @@
extends AbstractAuxiliaryCacheAttributes
implements Serializable, ILateralCacheAttributes
{
-
+
+ private static final long serialVersionUID = -3408449508837393660L;
+
private static final boolean DEFAULT_RECEIVE = true;
String transmissionTypeName = "UDP";
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheInfo.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheInfo.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheInfo.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheInfo.java
Fri Feb 3 14:37:10 2006
@@ -29,6 +29,7 @@
/** Constructor for the LateralCacheInfo object */
private LateralCacheInfo()
{
+ super();
}
/**
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java
Fri Feb 3 14:37:10 2006
@@ -82,7 +82,8 @@
* It's the clients responsibility to decide how many
* of these there will be.
*
- * @param manager*/
+ * @param manager
+ */
public LateralCacheMonitor( ILateralCacheManager manager )
{
this.manager = manager;
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWait.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWait.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWait.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWait.java
Fri Feb 3 14:37:10 2006
@@ -47,6 +47,8 @@
public class LateralCacheNoWait
implements AuxiliaryCache
{
+ private static final long serialVersionUID = -7251187566116178475L;
+
private final static Log log = LogFactory.getLog( LateralCacheNoWait.class
);
private final LateralCache cache;
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
Fri Feb 3 14:37:10 2006
@@ -44,6 +44,8 @@
public class LateralCacheNoWaitFacade
implements AuxiliaryCache
{
+ private static final long serialVersionUID = -9047687810358008955L;
+
private final static Log log = LogFactory.getLog(
LateralCacheNoWaitFacade.class );
/** Description of the Field */
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheWatchRepairable.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheWatchRepairable.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheWatchRepairable.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheWatchRepairable.java
Fri Feb 3 14:37:10 2006
@@ -28,4 +28,5 @@
extends CacheWatchRepairable
implements ILateralCacheObserver
{
+ //nothing
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralElementDescriptor.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralElementDescriptor.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralElementDescriptor.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/LateralElementDescriptor.java
Fri Feb 3 14:37:10 2006
@@ -22,43 +22,52 @@
/**
* This class wraps command to other laterals.
- *
+ *
*/
public class LateralElementDescriptor
implements Serializable
{
+ private static final long serialVersionUID = 5268222498076063575L;
+
// command types
- /** Description of the Field */
+ /** The int for updates */
public final static int UPDATE = 1;
- /** Description of the Field */
+ /** The int for removes */
public final static int REMOVE = 2;
- /** Description of the Field */
+ /** The int instructing us to remove all */
public final static int REMOVEALL = 3;
- /** Description of the Field */
+ /** The int for disposing the cache. */
public final static int DISPOSE = 4;
/** Command to return an object. */
public final static int GET = 5;
- /** Description of the Field */
+ /** The Cache Element that we are distributing. */
public ICacheElement ce;
- /** Description of the Field */
+ /**
+ * The id of the the source of the request. This is use to prevent infinite
+ * loops.
+ */
public long requesterId;
/** Description of the Field */
public int command = UPDATE;
+ /**
+ * the hashcode value for this element.
+ */
public int valHashCode = -1;
-
+
// for update command
/** Constructor for the LateralElementDescriptor object */
public LateralElementDescriptor()
{
+ super();
}
/**
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheService.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheService.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheService.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheService.java
Fri Feb 3 14:37:10 2006
@@ -17,20 +17,18 @@
*/
import java.io.Serializable;
-import java.util.Set;
import java.util.Collections;
+import java.util.Set;
import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheService;
-
import org.apache.jcs.engine.ZombieCacheService;
-
import org.apache.jcs.engine.behavior.ICacheElement;
/**
* The ZombieLateralCacheService is used a facade when the lateral is not
* available. It balks when the lateral is in error. When lateral service is
* restored, this is replaced by a live facade.
- *
+ *
*/
public class ZombieLateralCacheService
extends ZombieCacheService
@@ -45,6 +43,7 @@
*/
public void update( ICacheElement item, long listenerId )
{
+ // zombies have no inner life
}
/*
@@ -55,6 +54,7 @@
*/
public void remove( String cacheName, Serializable key, long listenerId )
{
+ // zombies have no inner life
}
/*
@@ -65,6 +65,7 @@
*/
public void removeAll( String cacheName, long listenerId )
{
+ // zombies have no inner life
}
/*
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheWatch.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheWatch.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheWatch.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/ZombieLateralCacheWatch.java
Fri Feb 3 14:37:10 2006
@@ -28,4 +28,5 @@
extends ZombieCacheWatch
implements ILateralCacheObserver
{
+ // nothing
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheManager.java
Fri Feb 3 14:37:10 2006
@@ -53,10 +53,16 @@
public class LateralTCPCacheManager
extends LateralCacheAbstractManager
{
+
+ private static final long serialVersionUID = -9213011856644392480L;
+
private final static Log log = LogFactory.getLog(
LateralTCPCacheManager.class );
private static LateralCacheMonitor monitor;
+ /**
+ * Address to instance map.
+ */
protected static Map instances = new HashMap();
/**
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
Fri Feb 3 14:37:10 2006
@@ -46,6 +46,8 @@
public class LateralTCPListener
implements ILateralCacheListener, Serializable
{
+ private static final long serialVersionUID = -9107062664967131738L;
+
private final static Log log = LogFactory.getLog( LateralTCPListener.class
);
/** How long the server will block on an accept(). 0 is infinte. */
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPSender.java
Fri Feb 3 14:37:10 2006
@@ -346,6 +346,10 @@
public void dispose( String cache )
throws IOException
{
+ if ( log.isInfoEnabled() )
+ {
+ log.info( "Dispose called for cache [" + cache + "]" );
+ }
// WILL CLOSE CONNECTION USED BY ALL
oos.close();
}
@@ -382,8 +386,11 @@
return remoteHost;
}
- /** testing Method
- * @param args*/
+ /**
+ * This is a Testing Method. It should be moved to a unit test.
+ *
+ * @param args
+ */
public static void main( String args[] )
{
try
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
Fri Feb 3 14:37:10 2006
@@ -73,7 +73,7 @@
}
catch ( IOException e )
{
- //log.error( "Could not create sender", e );
+ // log.error( "Could not create sender", e );
// This gets thrown over and over in recovery mode.
// The stack trace isn't useful here.
log.error( "Could not create sender to [" + lca.getTcpServer() +
"] -- " + e.getMessage() );
@@ -87,7 +87,7 @@
/**
* @param item
* @throws IOException
- *
+ *
*/
public void update( ICacheElement item )
throws IOException
@@ -104,7 +104,7 @@
public void update( ICacheElement item, long requesterId )
throws IOException
{
-
+
// if we don't allow put, see if we should remove on put
if ( !this.getTcpLateralCacheAttributes().isAllowPut() )
{
@@ -126,7 +126,7 @@
// else issue a remove with the hashcode for remove check on
// on the other end, this will be a server config option
else
- {
+ {
if ( log.isDebugEnabled() )
{
log.debug( "Issuing a remvoe for a put" );
@@ -192,14 +192,22 @@
sender.dispose( cache );
}
- /*
- *
+ /**
+ * The service does not get via this method, so this return null
+ *
+ * @param key
+ * @return always null.
+ * @throws IOException
*/
public Serializable get( String key )
throws IOException
{
- //p( "junk get" );
- //return get( cattr.cacheName, key, true );
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "balking at get for key [" + key + "]" );
+ }
+ // p( "junk get" );
+ // return get( cattr.cacheName, key, true );
return null;
// nothing needs to be done
}
@@ -218,14 +226,14 @@
{
CacheElement ce = new CacheElement( cacheName, key, null );
LateralElementDescriptor led = new LateralElementDescriptor( ce );
- //led.requesterId = requesterId; // later
+ // led.requesterId = requesterId; // later
led.command = LateralElementDescriptor.GET;
- return sender.sendAndReceive( led );
+ return sender.sendAndReceive( led );
}
else
{
// nothing needs to be done
- return null;
+ return null;
}
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/TCPLateralCacheAttributes.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/TCPLateralCacheAttributes.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/TCPLateralCacheAttributes.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/TCPLateralCacheAttributes.java
Fri Feb 3 14:37:10 2006
@@ -32,6 +32,8 @@
implements ITCPLateralCacheAttributes
{
+ private static final long serialVersionUID = 1077889204513905220L;
+
private static final String DEFAULT_UDP_DISCOVERY_ADDRESS = "228.5.6.7";
private static final int DEFAULT_UDP_DISCOVERY_PORT = 6789;
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/UDPDiscoveryMessage.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/UDPDiscoveryMessage.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/UDPDiscoveryMessage.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/discovery/UDPDiscoveryMessage.java
Fri Feb 3 14:37:10 2006
@@ -13,6 +13,8 @@
implements Serializable
{
+ private static final long serialVersionUID = -5332377899560951794L;
+
/**
* This is the periodic broadcast of a servers location. This type of
* message is also sent in response to a REQUEST_BROADCAST.
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/utils/SocketOpener.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/utils/SocketOpener.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/utils/SocketOpener.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/lateral/socket/tcp/utils/SocketOpener.java
Fri Feb 3 14:37:10 2006
@@ -55,7 +55,7 @@
}
catch ( InterruptedException ire )
{
-
+ // swallow
}
return opener.getSocket();
}
@@ -82,6 +82,7 @@
}
catch ( IOException ioe )
{
+ // swallow
}
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCache.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCache.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCache.java
(original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCache.java
Fri Feb 3 14:37:10 2006
@@ -53,6 +53,8 @@
public class RemoteCache
implements ICache
{
+ private static final long serialVersionUID = -5329231850422826460L;
+
private final static Log log = LogFactory.getLog( RemoteCache.class );
final String cacheName;
@@ -495,7 +497,7 @@
/**
* Replaces the current remote cache service handle with the given handle.
*
- * @param remote,
+ * @param remote
* IRemoteCacheService -- the remote server or proxy to the
* remote server
*/
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheAttributes.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheAttributes.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheAttributes.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheAttributes.java
Fri Feb 3 14:37:10 2006
@@ -29,6 +29,8 @@
extends AbstractAuxiliaryCacheAttributes
implements IRemoteCacheAttributes
{
+ private static final long serialVersionUID = -1555143736942374000L;
+
private String remoteServiceName =
IRemoteCacheConstants.REMOTE_CACHE_SERVICE_VAL;
private String remoteHost;
@@ -69,6 +71,7 @@
/** Constructor for the RemoteCacheAttributes object */
public RemoteCacheAttributes()
{
+ super();
}
/**
@@ -183,6 +186,7 @@
}
catch ( Exception e )
{
+ // swallow
}
return this;
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
Fri Feb 3 14:37:10 2006
@@ -59,7 +59,7 @@
* Constructor for the RemoteCacheFailoverRunner object. This allows the
* FailoverRunner to modify the facade that the CompositeCache references.
*
- * @param facade,
+ * @param facade
* the facade the CompositeCache talks to.
* @param cacheMgr
*/
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheInfo.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheInfo.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheInfo.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheInfo.java
Fri Feb 3 14:37:10 2006
@@ -25,11 +25,10 @@
*/
public class RemoteCacheInfo
{
-
- // shouldn't be instantiated
- /** Constructor for the RemoteCacheInfo object */
+ /** shouldn't be instantiated */
private RemoteCacheInfo()
{
+ super();
}
/**
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java
Fri Feb 3 14:37:10 2006
@@ -39,6 +39,8 @@
public class RemoteCacheListener
implements IRemoteCacheListener, IRemoteCacheConstants, Serializable
{
+ private static final long serialVersionUID = 1L;
+
private final static Log log = LogFactory.getLog(
RemoteCacheListener.class );
/**
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheManager.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheManager.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheManager.java
Fri Feb 3 14:37:10 2006
@@ -44,6 +44,8 @@
public class RemoteCacheManager
implements AuxiliaryCacheManager
{
+ private static final long serialVersionUID = 798077557166389498L;
+
private final static Log log = LogFactory.getLog( RemoteCacheManager.class
);
// Contains mappings of Location instance to RemoteCacheManager instance.
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheMonitor.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheMonitor.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheMonitor.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheMonitor.java
Fri Feb 3 14:37:10 2006
@@ -72,6 +72,7 @@
/** Constructor for the RemoteCacheMonitor object */
private RemoteCacheMonitor()
{
+ super();
}
/**
@@ -137,6 +138,7 @@
}
catch ( InterruptedException ignore )
{
+ // swallow
}
}
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheObserver.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheObserver.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheObserver.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheObserver.java
Fri Feb 3 14:37:10 2006
@@ -27,5 +27,5 @@
public interface IRemoteCacheObserver
extends Remote, ICacheObserver
{
-
+ // nothing
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheServiceAdmin.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheServiceAdmin.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheServiceAdmin.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/behavior/IRemoteCacheServiceAdmin.java
Fri Feb 3 14:37:10 2006
@@ -27,4 +27,5 @@
public interface IRemoteCacheServiceAdmin
extends Remote, ICacheServiceAdmin
{
+ // nothing
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java
Fri Feb 3 14:37:10 2006
@@ -65,9 +65,11 @@
extends UnicastRemoteObject
implements IRemoteCacheService, IRemoteCacheObserver,
IRemoteCacheServiceAdmin, Unreferenced
{
+ private static final long serialVersionUID = -8072345435941473116L;
+
private final static Log log = LogFactory.getLog( RemoteCacheServer.class
);
- /** Description of the Field */
+ /** timing -- if we should record operation times. */
protected final static boolean timing = true;
//true;
@@ -363,6 +365,7 @@
}
catch ( Exception oee )
{
+ // swallow
}
// UPDATE LOCALS IF A REQUEST COMES FROM A CLUSTER
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerAttributes.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerAttributes.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerAttributes.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerAttributes.java
Fri Feb 3 14:37:10 2006
@@ -31,6 +31,8 @@
implements IRemoteCacheServerAttributes
{
+ private static final long serialVersionUID = -2741662082869155365L;
+
private String remoteServiceName =
IRemoteCacheConstants.REMOTE_CACHE_SERVICE_VAL;
private String remoteHost;
@@ -64,6 +66,7 @@
/** Constructor for the RemoteCacheAttributes object */
public RemoteCacheServerAttributes()
{
+ super();
}
/**
@@ -135,6 +138,7 @@
}
catch ( Exception e )
{
+ // swallow
}
return this;
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
Fri Feb 3 14:37:10 2006
@@ -46,6 +46,7 @@
/** Constructor for the RemoteCacheServerFactory object */
private RemoteCacheServerFactory()
{
+ super();
}
/////////////////////// Statup/shutdown methods. //////////////////
@@ -182,6 +183,7 @@
}
catch ( InterruptedException ex )
{
+ // swallow
}
System.exit( 0 );
}
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java
Fri Feb 3 14:37:10 2006
@@ -29,6 +29,7 @@
/** Constructor for the RemoteCacheServerInfo object */
private RemoteCacheServerInfo()
{
+ super();
}
/**
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java
URL:
http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java?rev=374766&r1=374765&r2=374766&view=diff
==============================================================================
---
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java
(original)
+++
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java
Fri Feb 3 14:37:10 2006
@@ -39,15 +39,17 @@
public class RemoteCacheServerListener
implements IRemoteCacheListener, IRemoteCacheConstants, Serializable
{
+ private static final long serialVersionUID = -8780933366946138971L;
+
private final static Log log = LogFactory.getLog(
RemoteCacheServerListener.class );
- /** Description of the Field */
+ /** cacheMgr */
protected static transient CompositeCacheManager cacheMgr;
- /** Description of the Field */
+ /** Singleton instance of the listner */
protected static IRemoteCacheListener instance;
- /** Description of the Field */
+ /** configuration attributes. */
protected IRemoteCacheAttributes irca;
/** Description of the Field */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]