Hi,
Here is a better version - please can someone commit this to cvs;
Index: conf/TurbineResources.properties
===================================================================
RCS file: /products/cvs/turbine/turbine/conf/TurbineResources.properties,v
retrieving revision 1.24
diff -u -r1.24 TurbineResources.properties
--- conf/TurbineResources.properties 2000/09/18 20:47:16 1.24
+++ conf/TurbineResources.properties 2000/09/21 23:16:04
@@ -129,7 +129,7 @@
#### Postgress
database.adaptor=DBPostgres
-database.adaptor.DBPostgres=postgresql.Driver
+database.adaptor.DBPostgres=org.postgresql.Driver
#### DB/2 Net
database.adaptor=DBDB2Net
Index: src/java/org/apache/turbine/services/cache/CachedObject.java
===================================================================
RCS file:
/products/cvs/turbine/turbine/src/java/org/apache/turbine/services/cache/CachedObject.java,v
retrieving revision 1.3
diff -u -r1.3 CachedObject.java
--- src/java/org/apache/turbine/services/cache/CachedObject.java 2000/08/29
22:27:34 1.3
+++ src/java/org/apache/turbine/services/cache/CachedObject.java 2000/09/21
+23:16:07
@@ -153,6 +153,15 @@
}
/**
+ * Resets the expiry clock to indicate this object is valid and in use.
+ *
+ */
+ public void resetExpires()
+ {
+ this.created = System.currentTimeMillis();
+ }
+
+ /**
* Set the stale status for the object.
*
* @param stale Whether the object is stale or not.
@@ -182,4 +191,41 @@
setStale( (System.currentTimeMillis() - created) > expires );
return getStale();
}
+
+ /**
+ * Calls all cache listener objects for this object - notifying them that this
+object is now stale and out of the cache
+ *
+ */
+ public void cachedObjectFinalizer()
+ {
+ Enumeration iter = listeners.elements();
+ while (iter.hasMoreElements())
+ {
+ CachedObjectListener listener = (CachedObjectListener)iter.nextElement();
+ listener.cachedObjectFinalizer(this);
+ }
+ }
+
+ /** set of listeners */
+ Vector listeners = new Vector();
+
+ /**
+ * Adds a cache object listener
+ *
+ */
+ public void addListener(CachedObjectListener listener)
+ {
+ listeners.addElement(listener);
+ }
+
+ /**
+ * Calls all cache listener objects for this object - notifying them that this
+object is now stale and out of the cache
+ *
+ */
+ public void removeListener(CachedObjectListener listener)
+ {
+ listeners.removeElement(listener);
+ }
+
+
}
Index: src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java
===================================================================
RCS file:
/products/cvs/turbine/turbine/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java,v
retrieving revision 1.4
diff -u -r1.4 TurbineGlobalCacheService.java
--- src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java
2000/08/31 18:26:43 1.4
+++ src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java
+2000/09/21 23:16:09
@@ -205,9 +205,11 @@
*/
public void clearCache()
{
- for ( Enumeration e = cache.elements(); e.hasMoreElements(); )
+ //Log.note("pre-cache size = "+cache.size());
+ for ( Enumeration e = cache.keys(); e.hasMoreElements(); )
{
- CachedObject co = (CachedObject) e.nextElement();
+ String id = (String)e.nextElement();
+ CachedObject co = (CachedObject) cache.get(id);
if ( co.isStale() )
{
if (co instanceof RefreshableCachedObject)
@@ -216,8 +218,12 @@
rco.refresh();
}
else
- cache.remove ( co );
+ {
+ cache.remove (id);
+ co.cachedObjectFinalizer();
+ }
}
}
+ //Log.note("post-cache size = "+cache.size());
}
}
-------------------------------------------------------
and this new file
src/java/org/apache/turbine/services/cache/CachedObjectListener.java
package org.apache.turbine.services.cache;
/*
* Copyright (c) 1997-2000 The Java Apache Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment:
* "This product includes software developed by the Java Apache
* Project for use in the Apache JServ servlet engine project
* <http://java.apache.org/>."
*
* 4. The names "Apache JServ", "Apache JServ Servlet Engine", "Turbine",
* "Apache Turbine", "Turbine Project", "Apache Turbine Project" and
* "Java Apache Project" must not be used to endorse or promote products
* derived from this software without prior written permission.
*
* 5. Products derived from this software may not be called "Apache JServ"
* nor may "Apache" nor "Apache JServ" appear in their names without
* prior written permission of the Java Apache Project.
*
* 6. Redistributions of any form whatsoever must retain the following
* acknowledgment:
* "This product includes software developed by the Java Apache
* Project for use in the Apache JServ servlet engine project
* <http://java.apache.org/>."
*
* THIS SOFTWARE IS PROVIDED BY THE JAVA APACHE PROJECT "AS IS" AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JAVA APACHE PROJECT OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Java Apache Group. For more information
* on the Java Apache Project and the Apache JServ Servlet Engine project,
* please see <http://java.apache.org/>.
*
*/
// Java Core Classes
import java.util.*;
// Turbine stuff.
import org.apache.turbine.services.resources.TurbineResources;
/*
* Wrapper for an object you want to store in a cache for a period of
* time.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a>
* @version $Id: CachedObject.java,v 1.3 2000/08/29 22:27:34 gonzalo Exp $
*/
public class CachedObject
implements java.io.Serializable
{
/** The object to be cached. */
private Object contents = null;
/** Default age (30 minutes). */
private long defaultage =
TurbineResources.getLong("cachedobject.defaultage", 1800000);
/** When created. **/
protected long created = 0;
/** When it expires. **/
private long expires = 0;
/** Is this object stale/expired? */
private boolean stale = false;
/**
* Constructor; sets the object to expire in the default time (30
* minutes).
*
* @param o The object you want to cache.
*/
public CachedObject(Object o)
{
this.contents = o;
this.expires = defaultage;
this.created = System.currentTimeMillis();
}
/**
* Constructor.
*
* @param o The object to cache.
* @param expires How long before the object expires, in ms,
* e.g. 1000 = 1 second.
*/
public CachedObject(Object o,
long expires)
{
if ( expires == 0 )
{
this.expires = defaultage;
}
this.contents = o;
this.expires = expires;
this.created = System.currentTimeMillis();
}
/**
* Returns the cached object.
*
* @return The cached object.
*/
public Object getContents()
{
return contents;
}
/**
* Returns the creation time for the object.
*
* @return When the object was created.
*/
public long getCreated()
{
return created;
}
/**
* Returns the expiration time for the object.
*
* @return When the object expires.
*/
public long getExpires()
{
return expires;
}
/**
* Resets the expiry clock to indicate this object is valid and in use.
*
*/
public void resetExpires()
{
this.created = System.currentTimeMillis();
}
/**
* Set the stale status for the object.
*
* @param stale Whether the object is stale or not.
*/
public void setStale ( boolean stale )
{
this.stale = stale;
}
/**
* Get the stale status for the object.
*
* @return Whether the object is stale or not.
*/
public boolean getStale()
{
return stale;
}
/**
* Is the object stale?
*
* @return True if the object is stale.
*/
public boolean isStale()
{
setStale( (System.currentTimeMillis() - created) > expires );
return getStale();
}
/**
* Calls all cache listener objects for this object - notifying them that this
object is now stale and out of the cache
*
*/
public void cachedObjectFinalizer()
{
Enumeration iter = listeners.elements();
while (iter.hasMoreElements())
{
CachedObjectListener listener = (CachedObjectListener)iter.nextElement();
listener.cachedObjectFinalizer(this);
}
}
/** set of listeners */
Vector listeners = new Vector();
/**
* Adds a cache object listener
*
*/
public void addListener(CachedObjectListener listener)
{
listeners.addElement(listener);
}
/**
* Calls all cache listener objects for this object - notifying them that this
object is now stale and out of the cache
*
*/
public void removeListener(CachedObjectListener listener)
{
listeners.removeElement(listener);
}
}
Thanks,
Chris
---
"surely it is madness to accept life as it is and not as it could be"
______________________________________________
FREE Personalized Email at Mail.com
Sign up at http://www.mail.com/?sr=signup
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Search: <http://www.mail-archive.com/turbine%40list.working-dogs.com/>
Problems?: [EMAIL PROTECTED]
