sgala 01/09/26 03:29:04
Modified: src/java/org/apache/jetspeed/cache/disk
JetspeedDiskCache.java JetspeedDiskCacheEntry.java
Log:
Log.note is deprecated. Log.info instead. Way to go to get rid of deprecations
Revision Changes Path
1.41 +14 -14
jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/JetspeedDiskCache.java
Index: JetspeedDiskCache.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/JetspeedDiskCache.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- JetspeedDiskCache.java 2001/09/04 12:06:58 1.40
+++ JetspeedDiskCache.java 2001/09/26 10:29:04 1.41
@@ -80,7 +80,7 @@
@see org.apache.jetspeed.daemon.impl.DiskCacheDaemon
@author <A HREF="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</A>
@author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
-@version $Id: JetspeedDiskCache.java,v 1.40 2001/09/04 12:06:58 sgala Exp $
+@version $Id: JetspeedDiskCache.java,v 1.41 2001/09/26 10:29:04 sgala Exp $
*/
public class JetspeedDiskCache implements DiskCache {
@@ -122,7 +122,7 @@
*/
private void initEntries() {
- Log.note("Disk Cache init Entries...");
+ Log.info("Disk Cache init Entries...");
File temp = new File( directory );
String files[] = temp.list();
@@ -136,9 +136,9 @@
for ( int i = 0; i < files.length; ++i ) {
if ( files[i].indexOf("http_") == 0 ) {
- Log.note("Initializing cache entry: " + files[i]);
+ Log.info("Initializing cache entry: " + files[i]);
JetspeedDiskCacheEntry ent = new JetspeedDiskCacheEntry( new File(
getRoot(), files[i] ) );
- Log.note("Adding cache entry for " + ent.getSourceURL());
+ Log.info("Adding cache entry for " + ent.getSourceURL());
String interned = ent.getSourceURL().intern();
entries.put( interned, ent);
@@ -148,7 +148,7 @@
}
}
- Log.note("Disk Cache init Entries DONE.");
+ Log.info("Disk Cache init Entries DONE.");
}
@@ -164,7 +164,7 @@
Vector diskEntries = new Vector();
Enumeration cacheEntries = entries.elements();
- Log.note("Calling JetspeedDiskCache getEntries");
+ Log.info("Calling JetspeedDiskCache getEntries");
while(cacheEntries.hasMoreElements())
{
diskEntries.addElement(cacheEntries.nextElement());
@@ -209,10 +209,10 @@
if( entry != null)
{
- //Log.note("Returning local URL because it is cached: " + interned
);
+ //Log.info("Returning local URL because it is cached: " + interned
);
if(force)
{
- Log.note("Refreshing local URL!!!" + interned);
+ Log.info("Refreshing local URL!!!" + interned);
URLFetcher.refresh(interned);
}
@@ -230,14 +230,14 @@
if(dce == null )
{
- Log.note("Adding Local to cache list: " + local);
+ Log.info("Adding Local to cache list: " + local);
dce = new JetspeedDiskCacheEntry( local );
entries.put(local, dce);
URLManager.register( local,
URLManager.STATUS_OK,
"Local added" );
}
- Log.note("Returning local cached URL");
+ Log.info("Returning local cached URL");
return dce;
}
@@ -249,7 +249,7 @@
if ( ( DiskCacheUtils.isCached( this, url ) == false ) || force ) {
- //Log.note( "DiskCache: MISS - fectching document: " + url );
+ //Log.info( "DiskCache: MISS - fectching document: " + url );
//if it doesn't exist then pull it down from a URL and save it to a
file
// SGP We can arrive here either because force was true or
@@ -264,7 +264,7 @@
} else {
//else it is a remote URL and can not be cached.
- Log.note( "DiskCache: this URL can't be stored in cache... providing it
directly." + url );
+ Log.info( "DiskCache: this URL can't be stored in cache... providing it
directly." + url );
return new JetspeedDiskCacheEntry( url );
}
@@ -310,7 +310,7 @@
if( oldfile.exists() )
oldfile.delete();
} catch (Exception e) {
- Log.note("Exception " +
+ Log.info("Exception " +
e.getMessage() +
" while deleting " + oldfilename);
}
@@ -462,7 +462,7 @@
if (cache == null) {
cache = new JetspeedDiskCache(directory);
JetspeedDiskCache.instances.put( directory, cache );
- Log.note("DISK CACHE: Initing cache for " + directory);
+ Log.info("DISK CACHE: Initing cache for " + directory);
cache.initEntries();
}
return cache;
1.27 +8 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/JetspeedDiskCacheEntry.java
Index: JetspeedDiskCacheEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/JetspeedDiskCacheEntry.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JetspeedDiskCacheEntry.java 2001/05/29 18:47:21 1.26
+++ JetspeedDiskCacheEntry.java 2001/09/26 10:29:04 1.27
@@ -101,7 +101,7 @@
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Kevin A. Burton</a>
*@author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- *@version $Id: JetspeedDiskCacheEntry.java,v 1.26 2001/05/29 18:47:21 sgala Exp $
+ *@version $Id: JetspeedDiskCacheEntry.java,v 1.27 2001/09/26 10:29:04 sgala Exp $
**/
public class JetspeedDiskCacheEntry implements DiskCacheEntry {
@@ -257,7 +257,7 @@
Get an input stream from this entry
*/
public InputStream getInputStream() throws IOException {
- Log.note( "CacheEntry getInputStream() called: " + this.getURL() );
+ Log.info( "CacheEntry getInputStream() called: " + this.getURL() );
if(this.getFile() != null)
{
return new FileInputStream( this.getFile() );
@@ -298,7 +298,7 @@
encoding = JetspeedResources.getString(
JetspeedResources.CONTENT_ENCODING_KEY,
"iso-8859-1" );
}
- //Log.note("Disk Cache Entry: getReader URL -> " +
+ //Log.info("Disk Cache Entry: getReader URL -> " +
// this.getURL() +
// " encoding -> " +
// encoding );
@@ -317,7 +317,7 @@
Log.error( e.toString() );
reader = new FileReader( this.getFile() );
}
- //Log.note("Disk Cache Entry: getReader file -> " +
+ //Log.info("Disk Cache Entry: getReader file -> " +
// this.getURL() +
// " encoding -> " +
// reader.getEncoding() );
@@ -453,7 +453,7 @@
{
super( conn.getOutputStream(), encoding );
this.conn = conn;
- Log.note("HttpURLWriter encoding -> " +
+ Log.info("HttpURLWriter encoding -> " +
encoding + " method -> " + this.conn.getRequestMethod() );
}
@@ -463,7 +463,7 @@
super.close();
//Required to get the real connection sending PUT data
this.conn.getResponseCode();
- Log.note("HttpURLWriter close encoding -> " +
+ Log.info("HttpURLWriter close encoding -> " +
encoding + " method -> " + this.conn.getRequestMethod() +
" Status -> " + this.conn.getResponseCode() );
@@ -479,14 +479,14 @@
{
super( file );
this.filename = file.getPath();
- Log.note("FileURLWriter opening file -> " + filename );
+ Log.info("FileURLWriter opening file -> " + filename );
}
public void close() throws IOException
{
//We close the stream
super.close();
- Log.note("FileURLWriter closing file -> " + filename );
+ Log.info("FileURLWriter closing file -> " + filename );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
