You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jcs-dev@jakarta.apache.org by as...@apache.org on 2004/06/30 04:42:42 UTC
cvs commit: jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/http/server DeleteCacheServlet.java AbstractDeleteCacheServlet.java
asmuts 2004/06/29 19:42:42
Modified: src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc
LateralXMLRPCService.java LateralXMLRPCSender.java
LateralXMLRPCReceiver.java
LateralCacheXMLRPCListener.java
src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp
LateralUDPService.java LateralUDPSender.java
LateralGroupCacheUDPListener.java
LateralCacheUDPListener.java
src/experimental/org/apache/jcs/auxiliary/lateral/http/server
DeleteCacheServlet.java
AbstractDeleteCacheServlet.java
Log:
Just making the experimental stuff buildable.
Revision Changes Path
1.3 +17 -6 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java
Index: LateralXMLRPCService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LateralXMLRPCService.java 15 Apr 2004 19:21:25 -0000 1.2
+++ LateralXMLRPCService.java 30 Jun 2004 02:42:42 -0000 1.3
@@ -19,12 +19,10 @@
import java.io.*;
import java.io.BufferedReader;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.IOException;
-import java.io.Reader;
import java.io.Serializable;
-
+import java.util.Set;
import org.apache.jcs.auxiliary.lateral.LateralCacheAttributes;
import org.apache.jcs.auxiliary.lateral.LateralCacheInfo;
import org.apache.jcs.auxiliary.lateral.LateralElementDescriptor;
@@ -102,7 +100,7 @@
* @param requesterId
* @exception IOException
*/
- public void update( ICacheElement item, byte requesterId )
+ public void update( ICacheElement item, long requesterId )
throws IOException
{
LateralElementDescriptor led = new LateralElementDescriptor( item );
@@ -128,7 +126,7 @@
* @param requesterId
* @exception IOException
*/
- public void remove( String cacheName, Serializable key, byte requesterId )
+ public void remove( String cacheName, Serializable key, long requesterId )
throws IOException
{
CacheElement ce = new CacheElement( cacheName, key, null );
@@ -193,6 +191,19 @@
}
/**
+ * Gets the set of keys of objects currently in the group
+ * throws UnsupportedOperationException
+ */
+ public Set getGroupKeys(String cacheName, String group)
+ {
+ if (true)
+ {
+ throw new UnsupportedOperationException("Groups not implemented.");
+ }
+ return null;
+ }
+
+ /**
* @param cacheName
* @exception IOException
*/
@@ -207,7 +218,7 @@
* @param requesterId
* @exception IOException
*/
- public void removeAll( String cacheName, byte requesterId )
+ public void removeAll( String cacheName, long requesterId )
throws IOException
{
CacheElement ce = new CacheElement( cacheName, "ALL", null );
1.3 +3 -3 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCSender.java
Index: LateralXMLRPCSender.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCSender.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LateralXMLRPCSender.java 15 Apr 2004 19:21:25 -0000 1.2
+++ LateralXMLRPCSender.java 30 Jun 2004 02:42:42 -0000 1.3
@@ -306,7 +306,7 @@
* @param requesterId
* @exception IOException
*/
- public void remove( String cacheName, Serializable key, byte requesterId )
+ public void remove( String cacheName, Serializable key, long requesterId )
throws IOException
{
CacheElement ce = new CacheElement( cacheName, key, null );
@@ -367,7 +367,7 @@
* @param requesterId
* @exception IOException
*/
- public void removeAll( String cacheName, byte requesterId )
+ public void removeAll( String cacheName, long requesterId )
throws IOException
{
CacheElement ce = new CacheElement( cacheName, "ALL", null );
1.3 +1 -1 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCReceiver.java
Index: LateralXMLRPCReceiver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralXMLRPCReceiver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LateralXMLRPCReceiver.java 15 Apr 2004 19:21:26 -0000 1.2
+++ LateralXMLRPCReceiver.java 30 Jun 2004 02:42:42 -0000 1.3
@@ -82,7 +82,7 @@
server.addHandler( this.HANDLERNAME, handler );
server.setParanoid( false );
}
- catch ( IOException ioe )
+ catch ( Exception ioe )
{
log.error( ioe );
}
1.4 +7 -14 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java
Index: LateralCacheXMLRPCListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/xmlrpc/LateralCacheXMLRPCListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LateralCacheXMLRPCListener.java 15 Apr 2004 19:21:26 -0000 1.3
+++ LateralCacheXMLRPCListener.java 30 Jun 2004 02:42:42 -0000 1.4
@@ -30,7 +30,7 @@
import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICompositeCache;
+import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.control.CompositeCacheManager;
import org.apache.jcs.engine.CacheConstants;
@@ -100,7 +100,7 @@
*
* @param id The new listenerId value
*/
- public void setListenerId( byte id )
+ public void setListenerId( long id )
throws IOException
{
LateralCacheInfo.listenerId = id;
@@ -116,7 +116,7 @@
*
* @return The listenerId value
*/
- public byte getListenerId()
+ public long getListenerId()
throws IOException
{
@@ -171,9 +171,7 @@
log.debug( "PUTTING ELEMENT FROM LATERAL" );
}
getCacheManager();
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache( cb.getCacheName() );
- cache.update( cb, CacheConstants.REMOTE_INVOKATION );
- //handleRemove(cb.getCacheName(), cb.getKey());
+ cacheMgr.getCache( cb.getCacheName() ).localUpdate( cb );
}
@@ -187,10 +185,7 @@
}
getCacheManager();
- // interface limitation here
-
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache( cacheName );
- cache.remove( key, CacheConstants.REMOTE_INVOKATION );
+ cacheMgr.getCache( cacheName ).localRemove( key );
}
@@ -216,9 +211,7 @@
log.debug( "handleGet> cacheName=" + cacheName + ", key = " + key );
}
getCacheManager();
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache( cacheName );
- // get container
- return cache.get( key, CacheConstants.REMOTE_INVOKATION );
+ return cacheMgr.getCache( cacheName ).localGet( key );
}
/** Description of the Method */
@@ -230,7 +223,7 @@
log.debug( "handleDispose> cacheName=" + cacheName );
}
CompositeCacheManager cm = ( CompositeCacheManager ) cacheMgr;
- cm.freeCache( cacheName, CacheConstants.REMOTE_INVOKATION );
+ cm.freeCache( cacheName, true );
}
1.3 +16 -3 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralUDPService.java
Index: LateralUDPService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralUDPService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LateralUDPService.java 15 Apr 2004 19:21:26 -0000 1.2
+++ LateralUDPService.java 30 Jun 2004 02:42:42 -0000 1.3
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.Reader;
import java.io.Serializable;
+import java.util.Set;
import org.apache.jcs.auxiliary.lateral.LateralCacheAttributes;
import org.apache.jcs.auxiliary.lateral.LateralCacheInfo;
@@ -84,7 +85,7 @@
/** Description of the Method */
- public void update( ICacheElement item, byte requesterId )
+ public void update( ICacheElement item, long requesterId )
throws IOException
{
LateralElementDescriptor led = new LateralElementDescriptor( item );
@@ -103,7 +104,7 @@
/** Description of the Method */
- public void remove( String cacheName, Serializable key, byte requesterId )
+ public void remove( String cacheName, Serializable key, long requesterId )
throws IOException
{
CacheElement ce = new CacheElement( cacheName, key, null );
@@ -157,6 +158,18 @@
// nothing needs to be done
}
+ /**
+ * Gets the set of keys of objects currently in the group
+ * throws UnsupportedOperationException
+ */
+ public Set getGroupKeys(String cacheName, String group)
+ {
+ if (true)
+ {
+ throw new UnsupportedOperationException("Groups not implemented.");
+ }
+ return null;
+ }
/** Description of the Method */
public void removeAll( String cacheName )
@@ -167,7 +180,7 @@
/** Description of the Method */
- public void removeAll( String cacheName, byte requesterId )
+ public void removeAll( String cacheName, long requesterId )
throws IOException
{
CacheElement ce = new CacheElement( cacheName, "ALL", null );
1.3 +2 -2 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralUDPSender.java
Index: LateralUDPSender.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralUDPSender.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LateralUDPSender.java 15 Apr 2004 19:21:26 -0000 1.2
+++ LateralUDPSender.java 30 Jun 2004 02:42:42 -0000 1.3
@@ -137,7 +137,7 @@
/** Description of the Method */
- public void remove( String cacheName, Serializable key, byte requesterId )
+ public void remove( String cacheName, Serializable key, long requesterId )
throws IOException
{
CacheElement ce = new CacheElement( cacheName, key, null );
@@ -173,7 +173,7 @@
/** Description of the Method */
- public void removeAll( String cacheName, byte requesterId )
+ public void removeAll( String cacheName, long requesterId )
throws IOException
{
CacheElement ce = new CacheElement( cacheName, "ALL", null );
1.4 +3 -3 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralGroupCacheUDPListener.java
Index: LateralGroupCacheUDPListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralGroupCacheUDPListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LateralGroupCacheUDPListener.java 15 Apr 2004 19:21:26 -0000 1.3
+++ LateralGroupCacheUDPListener.java 30 Jun 2004 02:42:42 -0000 1.4
@@ -24,7 +24,7 @@
import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheAttributes;
import org.apache.jcs.auxiliary.lateral.behavior.ILateralCacheListener;
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICompositeCache;
+import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.control.CompositeCacheManager;
import org.apache.jcs.engine.control.group.GroupAttrName;
@@ -101,8 +101,8 @@
* GroupId groupId = new GroupId( gan.groupId );
* cache.putGAN( gan, cb.getVal(), cb.getElementAttributes(), false);
*/
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache( cb.getCacheName() );
- cache.update( cb, true );
+ cacheMgr.getCache( cb.getCacheName() ).localUpdate( cb );
+
}
catch ( Exception ioe )
1.4 +5 -7 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java
Index: LateralCacheUDPListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/socket/udp/LateralCacheUDPListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LateralCacheUDPListener.java 15 Apr 2004 19:21:26 -0000 1.3
+++ LateralCacheUDPListener.java 30 Jun 2004 02:42:42 -0000 1.4
@@ -28,7 +28,7 @@
import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICacheElement;
-import org.apache.jcs.engine.behavior.ICompositeCache;
+import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.control.CompositeCacheManager;
import org.apache.jcs.engine.CacheConstants;
@@ -94,7 +94,7 @@
*
* @param id The new listenerId value
*/
- public void setListenerId( byte id )
+ public void setListenerId( long id )
throws IOException
{
LateralCacheInfo.listenerId = id;
@@ -110,7 +110,7 @@
*
* @return The listenerId value
*/
- public byte getListenerId()
+ public long getListenerId()
throws IOException
{
@@ -165,8 +165,7 @@
log.debug( "PUTTING ELEMENT FROM LATERAL" );
}
getCacheManager();
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache( cb.getCacheName() );
- cache.update( cb, true );
+ cacheMgr.getCache( cb.getCacheName() ).localUpdate( cb );
}
@@ -182,8 +181,7 @@
getCacheManager();
// interface limitation here
- ICompositeCache cache = ( ICompositeCache ) cacheMgr.getCache( cacheName );
- cache.remove( key, true );
+ cacheMgr.getCache( cacheName ).localRemove( key );
}
1.3 +2 -2 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/http/server/DeleteCacheServlet.java
Index: DeleteCacheServlet.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/http/server/DeleteCacheServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteCacheServlet.java 15 Apr 2004 19:21:26 -0000 1.2
+++ DeleteCacheServlet.java 30 Jun 2004 02:42:42 -0000 1.3
@@ -19,7 +19,7 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
-import org.apache.jcs.engine.control.group.GroupCacheHub;
+import org.apache.jcs.engine.control.CompositeCacheManager;
/**
* Description of the Class
@@ -35,7 +35,7 @@
throws ServletException
{
- cacheMgr = GroupCacheHub.getInstance();
+ cacheMgr = CompositeCacheManager.getInstance();
super.init( config );
1.4 +1 -3 jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/http/server/AbstractDeleteCacheServlet.java
Index: AbstractDeleteCacheServlet.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/experimental/org/apache/jcs/auxiliary/lateral/http/server/AbstractDeleteCacheServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractDeleteCacheServlet.java 15 Apr 2004 19:21:26 -0000 1.3
+++ AbstractDeleteCacheServlet.java 30 Jun 2004 02:42:42 -0000 1.4
@@ -36,9 +36,7 @@
import org.apache.jcs.engine.behavior.ICache;
-import org.apache.jcs.engine.control.group.GroupCacheHub;
-import org.apache.jcs.engine.control.group.GroupCacheHub;
-import org.apache.jcs.engine.control.group.GroupCacheHub;
+import org.apache.jcs.engine.control.CompositeCache;
import org.apache.jcs.engine.control.CompositeCacheManager;
import org.apache.jcs.engine.CacheConstants;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-jcs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-jcs-dev-help@jakarta.apache.org