Index: org/apache/jetspeed/cache/FileCache.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/FileCache.java,v retrieving revision 1.2 diff -u -r1.2 FileCache.java --- org/apache/jetspeed/cache/FileCache.java 14 Nov 2002 06:58:38 -0000 1.2 +++ org/apache/jetspeed/cache/FileCache.java 19 Jul 2003 21:46:58 -0000 @@ -63,7 +63,9 @@ import java.util.Iterator; import java.io.File; -import org.apache.turbine.util.Log; +// Jetspeed logging classes +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; /** * FileCache keeps a cache of files up-to-date with a most simple eviction policy. @@ -83,6 +85,11 @@ private FileCacheScanner scanner = null; private Map cache = null; + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(FileCache.class.getName()); /** * Default constructor. Use default values for scanReate and maxSize @@ -262,7 +269,7 @@ } catch (java.lang.IllegalThreadStateException e) { - Log.error("Exception starting scanner", e); + logger.error("Exception starting scanner", e); } } @@ -309,7 +316,7 @@ } catch (java.io.IOException e) { - Log.error("Exception getting file path: ", e); + logger.error("Exception getting file path: ", e); } // notify that eviction will soon take place for (Iterator lit = this.listeners.iterator(); lit.hasNext(); ) @@ -396,7 +403,7 @@ } catch (Exception e) { - Log.error("FileCache Scanner: Error in iteration...", e); + logger.error("FileCache Scanner: Error in iteration...", e); } sleep(FileCache.this.getScanRate() * 1000); @@ -410,7 +417,7 @@ } catch (InterruptedException e) { - Log.error("FileCacheScanner: recieved interruption, exiting.", e); + logger.error("FileCacheScanner: recieved interruption, exiting.", e); } } } // end inner class: FileCacheScanner Index: org/apache/jetspeed/cache/disk/DiskCacheUtils.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/DiskCacheUtils.java,v retrieving revision 1.18 diff -u -r1.18 DiskCacheUtils.java --- org/apache/jetspeed/cache/disk/DiskCacheUtils.java 7 May 2003 15:16:46 -0000 1.18 +++ org/apache/jetspeed/cache/disk/DiskCacheUtils.java 19 Jul 2003 21:46:59 -0000 @@ -54,9 +54,6 @@ package org.apache.jetspeed.cache.disk; -//jetspeed -import org.apache.jetspeed.util.URIEncoder; - //standard java stuff import java.io.File; import java.net.MalformedURLException; @@ -65,9 +62,13 @@ import java.util.Vector; //turbine -import org.apache.turbine.util.Log; import org.apache.turbine.services.servlet.TurbineServlet; + +// Jetspeed classes +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; +import org.apache.jetspeed.util.URIEncoder; /**

@@ -110,6 +111,11 @@ */ private static Vector localprotocols = JetspeedResources.getVector("diskcache.localprotocols"); + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(DiskCacheUtils.class.getName()); + private static String hostName = "localhost"; static { try { @@ -320,7 +326,7 @@ fileURL = DiskCacheUtils.getFile( instance, url ).toURL(); } catch (MalformedURLException e) { // what can we do in this case ? - Log.error(e); + logger.error("Exception getting URL", e); return null; } Index: org/apache/jetspeed/cache/disk/JetspeedDiskCache.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/JetspeedDiskCache.java,v retrieving revision 1.48 diff -u -r1.48 JetspeedDiskCache.java --- org/apache/jetspeed/cache/disk/JetspeedDiskCache.java 7 May 2003 15:16:46 -0000 1.48 +++ org/apache/jetspeed/cache/disk/JetspeedDiskCache.java 19 Jul 2003 21:46:59 -0000 @@ -56,6 +56,8 @@ //jetspeed import org.apache.jetspeed.util.URIEncoder; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.threadpool.ThreadPool; import org.apache.jetspeed.services.urlmanager.URLManager; import org.apache.jetspeed.services.urlmanager.URLFetcher; @@ -75,7 +77,6 @@ import javax.servlet.ServletContext; //turbine -import org.apache.turbine.util.Log; import org.apache.turbine.services.servlet.TurbineServlet; @@ -114,6 +115,11 @@ private Hashtable entries = new Hashtable(); /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedDiskCache.class.getName()); + + /** Create an instance of the document cache. */ private JetspeedDiskCache(String directory) { @@ -124,19 +130,19 @@ try { ServletContext sc = TurbineServlet.getServletContext(); tempdir = sc.getAttribute("javax.servlet.context.tempdir").toString() + "/jetspeed/cache"; - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug("DISK CACHE: will create cache in servlet temp directory " + tempdir); + logger.debug("DISK CACHE: will create cache in servlet temp directory " + tempdir); } } catch (Exception e) { - Log.error("DISK CACHE: problems creating cache in servlet temp directory " + logger.error("DISK CACHE: problems creating cache in servlet temp directory " + " falling back to WEB-INF/cache : " + e); } this.directory = tempdir; } else { - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug("DISK CACHE: will use cache in user configured directory " + directory); + logger.debug("DISK CACHE: will use cache in user configured directory " + directory); } } } @@ -150,7 +156,7 @@ */ private void initEntries() { - Log.info("Disk Cache init Entries..."); + logger.info("Disk Cache init Entries..."); //HACK: we need the URLManager started now to avoid locks... //init() acts as a barrier, making our thread wait until //URLManager is done initialization. @@ -165,7 +171,7 @@ } catch (Throwable t) { - Log.error( "initEntries: Unable to start URLManagerService", t ); + logger.error( "initEntries: Unable to start URLManagerService", t ); } File temp = new File( directory ); @@ -175,15 +181,15 @@ if (files == null) { - Log.error("DiskCache.initEntries: Error!!! - The cache directory cannot be found: " + directory); + logger.error("DiskCache.initEntries: Error!!! - The cache directory cannot be found: " + directory); } for ( int i = 0; i < files.length; ++i ) { if ( files[i].indexOf("http_") == 0 ) { - Log.info("Initializing cache entry: " + files[i]); + logger.info("Initializing cache entry: " + files[i]); JetspeedDiskCacheEntry ent = new JetspeedDiskCacheEntry( new File( getRoot(), files[i] ) ); - Log.info("Adding cache entry for " + ent.getSourceURL()); + logger.info("Adding cache entry for " + ent.getSourceURL()); String interned = ent.getSourceURL().intern(); entries.put( interned, ent); @@ -193,7 +199,7 @@ } } - Log.info("Disk Cache init Entries DONE."); + logger.info("Disk Cache init Entries DONE."); } @@ -209,7 +215,7 @@ Vector diskEntries = new Vector(); Enumeration cacheEntries = entries.elements(); - Log.info("Calling JetspeedDiskCache getEntries"); + logger.info("Calling JetspeedDiskCache getEntries"); while(cacheEntries.hasMoreElements()) { diskEntries.addElement(cacheEntries.nextElement()); @@ -257,7 +263,7 @@ //Log.info("Returning local URL because it is cached: " + interned ); if(force) { - Log.info("Refreshing local URL!!!" + interned); + logger.info("Refreshing local URL!!!" + interned); URLFetcher.refresh(interned); } @@ -267,7 +273,7 @@ //attempt to see if the user didn't specify a URL if they didn't then //assume it is localhost with the servlet port - Log.warn( "Cache getEntry Called with " + url ); + logger.warn( "Cache getEntry Called with " + url ); if ( DiskCacheUtils.isLocal( url ) ) { String local = DiskCacheUtils.getLocalURL( url ).intern(); @@ -275,14 +281,14 @@ if(dce == null ) { - Log.info("Adding Local to cache list: " + local); + logger.info("Adding Local to cache list: " + local); dce = new JetspeedDiskCacheEntry( local ); entries.put(local, dce); URLManager.register( local, URLManager.STATUS_OK, "Local added" ); } - Log.info("Returning local cached URL"); + logger.info("Returning local cached URL"); return dce; } @@ -309,7 +315,7 @@ } else { //else it is a remote URL and can not be cached. - Log.info( "DiskCache: this URL can't be stored in cache... providing it directly." + url ); + logger.info( "DiskCache: this URL can't be stored in cache... providing it directly." + url ); return new JetspeedDiskCacheEntry( url ); } @@ -355,9 +361,9 @@ if( oldfile.exists() ) oldfile.delete(); } catch (Exception e) { - Log.info("Exception " + + logger.info("Exception " + e.getMessage() + - " while deleting " + oldfilename); + " while deleting " + oldfilename, e); } JetspeedDiskCacheEntry dce = (JetspeedDiskCacheEntry) entries.get(url.intern()); if (dce != null ) @@ -471,7 +477,7 @@ os.close(); } catch (MalformedURLException e) { - Log.error( e ); + logger.error("Error in URL", e ); } return cache; @@ -507,9 +513,9 @@ if (cache == null) { cache = new JetspeedDiskCache(directory); JetspeedDiskCache.instances.put( directory, cache ); - Log.info("DISK CACHE: Initing cache for " + directory); + logger.info("DISK CACHE: Initing cache for " + directory); cache.initEntries(); - Log.info("DISK CACHE: Inited cache:" + directory); + logger.info("DISK CACHE: Inited cache:" + directory); } return cache; } Index: org/apache/jetspeed/cache/disk/JetspeedDiskCacheEntry.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/cache/disk/JetspeedDiskCacheEntry.java,v retrieving revision 1.31 diff -u -r1.31 JetspeedDiskCacheEntry.java --- org/apache/jetspeed/cache/disk/JetspeedDiskCacheEntry.java 7 May 2003 15:16:46 -0000 1.31 +++ org/apache/jetspeed/cache/disk/JetspeedDiskCacheEntry.java 19 Jul 2003 21:47:00 -0000 @@ -57,12 +57,11 @@ //jetspeed stuff import org.apache.jetspeed.util.URIEncoder; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.urlmanager.URLFetcher; import org.apache.jetspeed.services.resources.JetspeedResources; -//turbine stuff -import org.apache.turbine.util.Log; - //standard java stuff import java.io.*; import java.net.*; @@ -134,6 +133,11 @@ private long expires = 0; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedDiskCacheEntry.class.getName()); + + /** *

Build a DiskCacheEntry that is based on a cached filesystem entry * *

This is used to reconstruct the entries from the cache at boot time @@ -169,7 +173,7 @@ try { url = new URL(this.getURL()); } catch (MalformedURLException e) { - Log.error( e ); + logger.error("Error in URL", e); return; } @@ -185,7 +189,7 @@ JetspeedDiskCache.getInstance().add( this.getURL(), true ); } } catch ( IOException e ) { - Log.error( e ); + logger.error("Error building from file", e); return; } @@ -225,11 +229,11 @@ //now make sure it exists. if ( file.exists() == false ) { String message = "The following file does not exist: " + file.getAbsolutePath(); - Log.error( message ); + logger.error( message ); try { JetspeedDiskCache.getInstance().add( this.url, true ); } catch (Throwable e) { - Log.error( e ); + logger.error("Error setting file", e ); } } //file should exist after add in the Cache... @@ -265,7 +269,7 @@ Get an input stream from this entry */ public InputStream getInputStream() throws IOException { - Log.info( "CacheEntry getInputStream() called: " + this.getURL() ); + logger.info( "CacheEntry getInputStream() called: " + this.getURL() ); if(this.getFile() != null) { return new FileInputStream( this.getFile() ); @@ -322,7 +326,7 @@ // instead of local encoding reader = new InputStreamReader( new FileInputStream( this.getFile() ), "UTF8" ); } catch (UnsupportedEncodingException e) { - Log.error( e ); + logger.error("Encoding error", e); reader = new FileReader( this.getFile() ); } //Log.info("Disk Cache Entry: getReader file -> " + @@ -391,8 +395,8 @@ String localfile = this.getURL().substring(5); //remove "file:" this.lastModified = new File( localfile ).lastModified(); } catch ( Exception e ) { - if( Log.getLogger().isDebugEnabled() ) { - Log.debug("Error getLastModified ", e); + if( logger.isDebugEnabled() ) { + logger.debug("Error getLastModified ", e); } e.printStackTrace(); } @@ -464,7 +468,7 @@ { super( conn.getOutputStream(), encoding ); this.conn = conn; - Log.info("HttpURLWriter encoding -> " + + logger.info("HttpURLWriter encoding -> " + encoding + " method -> " + this.conn.getRequestMethod() ); } @@ -474,7 +478,7 @@ super.close(); //Required to get the real connection sending PUT data this.conn.getResponseCode(); - Log.info("HttpURLWriter close encoding -> " + + logger.info("HttpURLWriter close encoding -> " + encoding + " method -> " + this.conn.getRequestMethod() + " Status -> " + this.conn.getResponseCode() ); @@ -490,14 +494,14 @@ { super( file ); this.filename = file.getPath(); - Log.info("FileURLWriter opening file -> " + filename ); + logger.info("FileURLWriter opening file -> " + filename ); } public void close() throws IOException { //We close the stream super.close(); - Log.info("FileURLWriter closing file -> " + filename ); + logger.info("FileURLWriter closing file -> " + filename ); } } Index: org/apache/jetspeed/capability/CapabilityMapFactory.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/capability/CapabilityMapFactory.java,v retrieving revision 1.13 diff -u -r1.13 CapabilityMapFactory.java --- org/apache/jetspeed/capability/CapabilityMapFactory.java 4 Mar 2003 00:04:51 -0000 1.13 +++ org/apache/jetspeed/capability/CapabilityMapFactory.java 19 Jul 2003 21:47:00 -0000 @@ -56,10 +56,12 @@ import org.apache.jetspeed.om.registry.ClientEntry; import org.apache.jetspeed.om.registry.ClientRegistry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; + /** This class describes various browsers capabilities and provides the @@ -79,6 +81,11 @@ public static final String AGENT_XML = "agentxml/1.0"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(CapabilityMapFactory.class.getName()); + + /** Returns the map corresponding to the given RunData. * FIXME: the method will be changed to use a Jetspeed specific request @@ -120,13 +127,13 @@ { if (useragent.equals(DEFAULT_AGENT)) { - Log.error("CapabilityMap: Default agent not found in Client Registry !"); + logger.error("CapabilityMap: Default agent not found in Client Registry !"); } else { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("CapabilityMap: useragent "+ useragent + "unknown, falling back to default"); + logger.debug("CapabilityMap: useragent "+ useragent + "unknown, falling back to default"); } map = getDefaultCapabilityMap(); } @@ -137,9 +144,9 @@ } - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("CapabilityMap: User-agent: "+useragent+" mapped to "+map); + logger.debug("CapabilityMap: User-agent: "+useragent+" mapped to "+map); } return map; Index: org/apache/jetspeed/daemon/DaemonThread.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/DaemonThread.java,v retrieving revision 1.18 diff -u -r1.18 DaemonThread.java --- org/apache/jetspeed/daemon/DaemonThread.java 7 May 2003 15:16:46 -0000 1.18 +++ org/apache/jetspeed/daemon/DaemonThread.java 19 Jul 2003 21:47:00 -0000 @@ -54,9 +54,9 @@ package org.apache.jetspeed.daemon; -import org.apache.turbine.util.Log; - import org.apache.jetspeed.services.daemonfactory.DaemonFactory; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; /** @author Kevin A. Burton @@ -67,6 +67,11 @@ private Daemon daemon = null; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(DaemonThread.class.getName()); + + /** */ public DaemonThread( DaemonEntry entry ) { @@ -77,7 +82,7 @@ this.setPriority( Thread.MIN_PRIORITY ); } catch (DaemonException e) { //really screwed here. - Log.error(e); + logger.error("Error instantiating DaemonThread", e); } } @@ -101,7 +106,7 @@ DaemonEntry de = this.getDaemon().getDaemonEntry(); - Log.info( "DaemonThread: started processing daemon " + de.getName() ); + logger.info( "DaemonThread: started processing daemon " + de.getName() ); if ( de.onStartup() ) { this.runDaemon( this.getDaemon() ); @@ -136,15 +141,15 @@ daemon.setStatus( Daemon.STATUS_PROCESSING ); - Log.info( "DaemonThread -> PROCESSING daemon -> " + daemon.getDaemonEntry().getName() ); + logger.info( "DaemonThread -> PROCESSING daemon -> " + daemon.getDaemonEntry().getName() ); try { daemon.run(); } catch ( Throwable t ) { - Log.error( "Could not process Daemon: " + daemon.getDaemonEntry().getName(), t ); + logger.error( "Could not process Daemon: " + daemon.getDaemonEntry().getName(), t ); } - Log.info( "DaemonThread -> *DONE* PROCESSING daemon -> " + daemon.getDaemonEntry().getName() ); + logger.info( "DaemonThread -> *DONE* PROCESSING daemon -> " + daemon.getDaemonEntry().getName() ); daemon.setStatus( Daemon.STATUS_PROCESSED ); Index: org/apache/jetspeed/daemon/impl/BadURLManagerDaemon.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/BadURLManagerDaemon.java,v retrieving revision 1.12 diff -u -r1.12 BadURLManagerDaemon.java --- org/apache/jetspeed/daemon/impl/BadURLManagerDaemon.java 7 May 2003 15:16:46 -0000 1.12 +++ org/apache/jetspeed/daemon/impl/BadURLManagerDaemon.java 19 Jul 2003 21:47:01 -0000 @@ -60,6 +60,8 @@ import org.apache.jetspeed.daemon.DaemonEntry; import org.apache.jetspeed.cache.disk.DiskCacheUtils; import org.apache.jetspeed.cache.disk.JetspeedDiskCache; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.urlmanager.URLManager; import org.apache.jetspeed.services.urlmanager.URLFetcher; @@ -67,9 +69,6 @@ import java.io.IOException; import java.util.Iterator; -//turbine stuff -import org.apache.turbine.util.Log; - /** Manages pulling URLs from the BadURLManager, and if they are available, removing them from the BadURLManager and placing them in the DiskCache. @@ -83,13 +82,18 @@ private int result = Daemon.RESULT_UNKNOWN; private DaemonConfig config = null; private DaemonEntry entry = null; + + /** + * Static initilization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(BadURLManagerDaemon.class.getName()); /** Go over all the documents on the system and if refresh them if necessary. */ public void run() { - Log.info("Checking for valid URLs within the URLManager"); + logger.info("Checking for valid URLs within the URLManager"); this.setResult( Daemon.RESULT_PROCESSING ); @@ -106,7 +110,7 @@ URLManager.unregister(url); - Log.info("Removing " + url + " from BadURL list" ); + logger.info("Removing " + url + " from BadURL list" ); this.save(); //FIXME: It should check refresh of the portlets, like DiskCache... @@ -116,14 +120,14 @@ } catch ( Throwable t ) { //don't do anything here because the URL for this has a good //chance of being invalid anyway. - Log.error( t ); + logger.error("Invalid URL?", t); if ( DiskCacheUtils.isCached( url ) ) { try { //To avoid interference with the Disk Cache refreshing JetspeedDiskCache.getInstance().remove( url ); } catch (IOException ioe) {} } - Log.info("Failed to load: " + url + " from BadURL list"); + logger.info("Failed to load: " + url + " from BadURL list"); } } Index: org/apache/jetspeed/daemon/impl/DiskCacheDaemon.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/DiskCacheDaemon.java,v retrieving revision 1.21 diff -u -r1.21 DiskCacheDaemon.java --- org/apache/jetspeed/daemon/impl/DiskCacheDaemon.java 7 May 2003 15:16:46 -0000 1.21 +++ org/apache/jetspeed/daemon/impl/DiskCacheDaemon.java 19 Jul 2003 21:47:01 -0000 @@ -61,10 +61,11 @@ import org.apache.jetspeed.daemon.impl.util.diskcachedaemon.URLRefresher; import org.apache.jetspeed.cache.disk.DiskCacheEntry; import org.apache.jetspeed.cache.disk.JetspeedDiskCache; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.threadpool.ThreadPool; //turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; /** @@ -84,13 +85,17 @@ private DaemonEntry entry = null; private RunData rundata = null; + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(DiskCacheDaemon.class.getName()); /** Go over all the documents on the system and if refresh them if necessary. */ public void run() { - Log.info("parsing out document store"); + logger.info("parsing out document store"); this.setResult( Daemon.RESULT_PROCESSING ); DiskCacheEntry urls[] = JetspeedDiskCache.getInstance().getEntries(); Index: org/apache/jetspeed/daemon/impl/FeedDaemon.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/FeedDaemon.java,v retrieving revision 1.39 diff -u -r1.39 FeedDaemon.java --- org/apache/jetspeed/daemon/impl/FeedDaemon.java 7 May 2003 15:16:46 -0000 1.39 +++ org/apache/jetspeed/daemon/impl/FeedDaemon.java 19 Jul 2003 21:47:01 -0000 @@ -61,12 +61,13 @@ import org.apache.jetspeed.daemon.DaemonEntry; import org.apache.jetspeed.daemon.Feed; import org.apache.jetspeed.util.SimpleTransform; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.services.registry.FileRegistry; import org.apache.jetspeed.services.registry.RegistryService; //turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.services.TurbineServices; //java stuff @@ -122,6 +123,11 @@ private static int count = 0; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(FeedDaemon.class.getName()); + + /** Get the feed count. */ public static int getCount() { @@ -168,7 +174,7 @@ this.setResult( Daemon.RESULT_PROCESSING ); - Log.info( "Jetspeed: FeedDaemon -- BEGIN -- " ); + logger.info( "Jetspeed: FeedDaemon -- BEGIN -- " ); FeedDaemon.count = 0; Feed[] feeds = getFeeds(); @@ -183,20 +189,20 @@ try { - Log.info( "BEGIN FEED -> " + url ); + logger.info( "BEGIN FEED -> " + url ); //get the list of PortletMarkup entries from OCS transformed = getEntries( url ); //the string transformed should now contain PML... tranform it into PortletMarkup - Log.info("Determining portlets..."); + logger.info("Determining portlets..."); FileRegistry registry = (FileRegistry)TurbineServices.getInstance() .getService( RegistryService.SERVICE_NAME ); registry.createFragment( name, transformed , true ); - Log.info( "END FEED -> " + url + " -> SUCCESS"); + logger.info( "END FEED -> " + url + " -> SUCCESS"); this.setResult( Daemon.RESULT_SUCCESS ); @@ -210,20 +216,17 @@ } } finally { - Log.info( "Jetspeed: FeedDaemon -- END -- " ); + logger.info( "Jetspeed: FeedDaemon -- END -- " ); } } /** - Logs a message to turbine but also sets the result for this daemon. + Logs a message to the logging service but also sets the result for this daemon. */ private void error( Throwable t, String message ) { this.setResult( Daemon.RESULT_FAILED ); - Log.error( message ); - if ( t != null ) { - Log.error( t ); - } + logger.error( message, t ); } /** @@ -243,7 +246,7 @@ String stylesheet = JetspeedResources.getString( JetspeedResources.CONTENTFEEDS_STYLESHEET_URL_KEY ); - Log.info( "FeedDaemon: transforming url: " + + logger.info( "FeedDaemon: transforming url: " + url + " with stylesheet: " + stylesheet ); Index: org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java,v retrieving revision 1.7 diff -u -r1.7 ThreadGroupJoin.java --- org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java 7 May 2003 15:16:47 -0000 1.7 +++ org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java 19 Jul 2003 21:47:01 -0000 @@ -54,7 +54,8 @@ package org.apache.jetspeed.daemon.impl.util; -import org.apache.turbine.util.Log; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; /** Util class for joining a ThreadGroup and joining all of its Threads and waiting @@ -66,6 +67,11 @@ public class ThreadGroupJoin { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ThreadGroupJoin.class.getName()); + + /** Join a ThreadGroup and wait until it finishes */ public static void join( ThreadGroup tg ) { @@ -114,9 +120,9 @@ long seconds = ( System.currentTimeMillis() - begin ) / 1000; begin = System.currentTimeMillis(); - if ( Log.getLogger().isInfoEnabled() ) + if ( logger.isInfoEnabled() ) { - Log.info( source + ": has completed " + i + " threads in " + seconds + " second(s)" ); + logger.info( source + ": has completed " + i + " threads in " + seconds + " second(s)" ); } } @@ -124,7 +130,7 @@ } } catch (InterruptedException e) { - Log.info( "Thread: " + threads[i].getName() + " -> DONE"); + logger.info( "Thread: " + threads[i].getName() + " -> DONE"); //noop. this is standard. } } Index: org/apache/jetspeed/daemon/impl/util/diskcachedaemon/PortletRefresher.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/PortletRefresher.java,v retrieving revision 1.15 diff -u -r1.15 PortletRefresher.java --- org/apache/jetspeed/daemon/impl/util/diskcachedaemon/PortletRefresher.java 14 May 2002 06:32:58 -0000 1.15 +++ org/apache/jetspeed/daemon/impl/util/diskcachedaemon/PortletRefresher.java 19 Jul 2003 21:47:01 -0000 @@ -56,12 +56,13 @@ //jetspeed stuff import org.apache.jetspeed.om.registry.PortletEntry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.services.PortletFactory; import org.apache.jetspeed.services.urlmanager.URLManager; //turbine stuff -import org.apache.turbine.util.Log; import org.apache.jetspeed.services.resources.JetspeedResources; /** @@ -78,6 +79,11 @@ private PortletEntry entry = null; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PortletRefresher.class.getName()); + + /** Given an Entry and RunData, create a PortletRefresher */ public PortletRefresher( PortletEntry entry ) { @@ -97,7 +103,7 @@ } } catch ( Throwable t ) { - Log.error( t ); + logger.error("Error getting portlet", t); URLManager.register( this.entry.getURL(), URLManager.STATUS_BAD, t.toString() ); Registry.removeEntry( Registry.PORTLET, this.entry.getName() ); Index: org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java,v retrieving revision 1.14 diff -u -r1.14 URLRefresher.java --- org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java 7 May 2003 15:16:47 -0000 1.14 +++ org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java 19 Jul 2003 21:47:02 -0000 @@ -56,12 +56,11 @@ //jetspeed stuff import org.apache.jetspeed.om.registry.PortletEntry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.services.urlmanager.URLFetcher; -//turbine stuff -import org.apache.turbine.util.Log; - //Java stuff import java.util.Enumeration; @@ -80,6 +79,11 @@ private String url = null; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(URLRefresher.class.getName()); + + /** default constructor */ public URLRefresher( String url ) { @@ -125,16 +129,13 @@ catch (Throwable t) { //FIXME: Put it in the bad URL list - Log.info( "DiskCacheDaemon: Error refreshing: " + url ); + logger.info( "DiskCacheDaemon: Error refreshing: " + url ); } } } } } catch ( Throwable t ) { - Log.error( t ); + logger.error("Error refreshing URL", t); } - - } - } Index: org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java,v retrieving revision 1.14 diff -u -r1.14 EntryInstantiator.java --- org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java 7 May 2003 15:16:47 -0000 1.14 +++ org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java 19 Jul 2003 21:47:02 -0000 @@ -55,12 +55,12 @@ package org.apache.jetspeed.daemon.impl.util.feeddaemon; //jetspeed stuff +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.threadpool.ThreadPool; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.om.registry.PortletEntry; -//turbine stuff -import org.apache.turbine.util.Log; /** Handles taking all known Portlets and then instantiatles them all so that @@ -74,6 +74,11 @@ private PortletEntry[] entries = null; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(EntryInstantiator.class.getName()); + + /** Create a EntryInstantiator for processing. */ public EntryInstantiator( PortletEntry[] entries ) { @@ -83,9 +88,9 @@ public void process() { - if ( Log.getLogger().isInfoEnabled() ) + if ( logger.isInfoEnabled() ) { - Log.info( "BEGIN: EntryInstantiator: Instantiating " + + logger.info( "BEGIN: EntryInstantiator: Instantiating " + Registry.get(Registry.PORTLET).getEntryCount() + " Portlet(s) found in the PortletRegistry" ); } @@ -97,7 +102,7 @@ } - Log.info( "END: EntryInstantiator: Instantiating all Portlets found in the PortletRegistry" ); + logger.info( "END: EntryInstantiator: Instantiating all Portlets found in the PortletRegistry" ); } Index: org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java,v retrieving revision 1.24 diff -u -r1.24 Instantiator.java --- org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java 7 May 2003 15:16:47 -0000 1.24 +++ org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java 19 Jul 2003 21:47:02 -0000 @@ -58,6 +58,8 @@ import org.apache.jetspeed.cache.disk.DiskCacheUtils; import org.apache.jetspeed.cache.disk.JetspeedDiskCache; import org.apache.jetspeed.om.registry.PortletEntry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.services.PortletFactory; import org.apache.jetspeed.services.urlmanager.URLManager; @@ -65,9 +67,6 @@ import org.apache.jetspeed.services.urlmanager.URLFetcher; import org.apache.jetspeed.services.resources.JetspeedResources; -//turbine stuff -import org.apache.turbine.util.Log; - //Java stuff import java.io.IOException; @@ -104,6 +103,11 @@ private boolean forcePortet = false; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(Instantiator.class.getName()); + + /** Create a Instantiator with info on what to instantiate */ public Instantiator( PortletEntry entry ) { @@ -144,7 +148,7 @@ long total = ( System.currentTimeMillis() - download_begin ) / 1000; if ( total >= MAX_WARN_SECONDS ) { - Log.warn( this.getClass().getName() + " The following URL took too long (" + + logger.warn( this.getClass().getName() + " The following URL took too long (" + total + " second(s)) to download: " + url ); } @@ -154,7 +158,7 @@ //Not necessary to print a stack trace here because this will //generate too much output - Log.error( "The following URL couldn't be downloaded " + + logger.error( "The following URL couldn't be downloaded " + url + " and took " + ( System.currentTimeMillis() - download_begin ) / 1000 + @@ -176,13 +180,13 @@ if(this.entry == null) { - Log.error("Instantiator: Null Entry"); + logger.error("Instantiator: Null Entry"); return; } if(this.entry.getURL() == null) { - Log.error("Instantiator: Null URL"); + logger.error("Instantiator: Null URL"); return; } @@ -193,7 +197,7 @@ return; } catch ( Throwable t) { //t.printStackTrace(); - Log.error( "Instantiator: Throwable", t); + logger.error( "Instantiator: Throwable", t); } org.apache.jetspeed.om.registry.Registry registry = @@ -214,7 +218,7 @@ } } catch ( Exception e ) { - Log.error( "InstantiatorThread: Couldn't create Portlet: ", e ); + logger.error( "InstantiatorThread: Couldn't create Portlet: ", e ); //SGP We add the URL to the BadList URLManager.register( this.entry.getURL(), URLManagerService.STATUS_BAD, e.toString() ); @@ -227,7 +231,7 @@ //log how many portlets we have instantiated. if ( id != 0 && id % LOG_INTERVAL == 0 ) { - Log.info( "Instantiator: instanted " + id + " portlet(s)" ); + logger.info( "Instantiator: instanted " + id + " portlet(s)" ); } } Index: org/apache/jetspeed/modules/ParameterLoader.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/ParameterLoader.java,v retrieving revision 1.3 diff -u -r1.3 ParameterLoader.java --- org/apache/jetspeed/modules/ParameterLoader.java 7 May 2003 15:16:47 -0000 1.3 +++ org/apache/jetspeed/modules/ParameterLoader.java 19 Jul 2003 21:47:03 -0000 @@ -57,6 +57,8 @@ // jetspeed stuff import org.apache.jetspeed.modules.parameters.ParameterPresentationStyle; import org.apache.jetspeed.modules.parameters.ParameterPresentationStyleFactory; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; // Java Core Classes @@ -70,7 +72,6 @@ import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.assemblerbroker.AssemblerBrokerService; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; /** * The purpose of this class is to allow one to load and execute @@ -87,6 +88,11 @@ private static ParameterLoader instance = new ParameterLoader(JetspeedResources.getInt("parameter.cache.size", 50)); /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ParameterLoader.class.getName()); + + /** * These ctor's are private to force clients to use getInstance() * to access this class. */ @@ -178,8 +184,8 @@ if (cache() && this.containsKey(provider)) { prm = (ParameterPresentationStyle) this.get(provider); - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("ParameterLoader: Serving parameter: " + provider + ", prm=" + prm + " from cache"); + if ( logger.isDebugEnabled() ) { + logger.debug("ParameterLoader: Serving parameter: " + provider + ", prm=" + prm + " from cache"); } } else { @@ -193,18 +199,18 @@ // Attempt to load the presentation style prm = (ParameterPresentationStyle)ab.getAssembler("parameter", provider); if (prm == null) { - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("ParameterLoader: Registering the factory"); + if ( logger.isDebugEnabled() ) { + logger.debug("ParameterLoader: Registering the factory"); } ab.registerFactory("parameter", new ParameterPresentationStyleFactory()); prm = (ParameterPresentationStyle)ab.getAssembler("parameter", provider); } - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("ParameterLoader: Loaded parameter: "+provider+", prm="+prm); + if ( logger.isDebugEnabled() ) { + logger.debug("ParameterLoader: Loaded parameter: "+provider+", prm="+prm); } } catch (ClassCastException cce) { prm = null; - Log.error( "Error loading presentation style", cce ); + logger.error( "Error loading presentation style", cce ); } if (prm == null) { @@ -256,14 +262,14 @@ if (parmkey.startsWith(key)) { try { String stylekey = parmkey.substring(parmkey.lastIndexOf(".")+1); - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug("ParameterLoader: parm name [" + parmName + "] - storing option [" + stylekey + + logger.debug("ParameterLoader: parm name [" + parmName + "] - storing option [" + stylekey + "] with value [" + parms.get(parmkey) + "]"); } result.put(stylekey, parms.get(parmkey)); } catch (Exception e) { - Log.error(e); + logger.error("Error extracting params", e); } } } Index: org/apache/jetspeed/modules/actions/ChangePassword.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/ChangePassword.java,v retrieving revision 1.5 diff -u -r1.5 ChangePassword.java --- org/apache/jetspeed/modules/actions/ChangePassword.java 9 Jul 2003 16:23:41 -0000 1.5 +++ org/apache/jetspeed/modules/actions/ChangePassword.java 19 Jul 2003 21:47:03 -0000 @@ -56,6 +56,8 @@ // Jetspeed import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.om.security.JetspeedUser; import org.apache.jetspeed.services.rundata.JetspeedRunData; @@ -66,7 +68,6 @@ import org.apache.turbine.modules.ActionLoader; import org.apache.turbine.services.localization.Localization; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; import org.apache.turbine.TurbineConstants; /** @@ -77,6 +78,12 @@ */ public class ChangePassword extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ChangePassword.class.getName()); + public void doPerform(RunData rundata) throws Exception { @@ -136,7 +143,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); rundata.setMessage(e.getMessage() != null ? e.getMessage() : e.toString()); rundata.setScreenTemplate(returnTemplate); } Index: org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java,v retrieving revision 1.36 diff -u -r1.36 CreateNewUserAndConfirm.java --- org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java 9 Jul 2003 16:23:42 -0000 1.36 +++ org/apache/jetspeed/modules/actions/CreateNewUserAndConfirm.java 19 Jul 2003 21:47:03 -0000 @@ -61,6 +61,8 @@ import org.apache.jetspeed.om.security.JetspeedUser; // Jetspeed modules +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedLinkFactory; @@ -76,7 +78,6 @@ import org.apache.turbine.services.template.TurbineTemplate; // turbine.util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.GenerateUniqueId; import org.apache.turbine.util.StringUtils; @@ -102,6 +103,12 @@ */ public class CreateNewUserAndConfirm extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(CreateNewUserAndConfirm.class.getName()); + public void doPerform( RunData data ) throws Exception { try @@ -244,7 +251,7 @@ } catch (Exception e) { - Log.error("CreateNewUserAndConfirm",e); + logger.error("CreateNewUserAndConfirm",e); data.setMessage(e.toString()); data.setStackTrace(StringUtils.stackTrace(e), e); data.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -288,7 +295,7 @@ } catch ( Exception e ) { - Log.error(e); + logger.error("Exception", e); data.setMessage(e.toString()); data.setStackTrace(StringUtils.stackTrace(e), e); data.setScreenTemplate(JetspeedResources.getString("template.error","Error")); Index: org/apache/jetspeed/modules/actions/JLoginUser.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v retrieving revision 1.35 diff -u -r1.35 JLoginUser.java --- org/apache/jetspeed/modules/actions/JLoginUser.java 9 Jul 2003 16:23:42 -0000 1.35 +++ org/apache/jetspeed/modules/actions/JLoginUser.java 19 Jul 2003 21:47:04 -0000 @@ -69,14 +69,15 @@ import org.apache.turbine.services.localization.Localization; import org.apache.turbine.services.velocity.TurbineVelocity; import org.apache.turbine.services.template.TurbineTemplate; -import org.apache.turbine.util.Log; import org.apache.turbine.util.mail.SimpleEmail; import org.apache.turbine.util.DynamicURI; import org.apache.turbine.util.RunData; -import org.apache.jetspeed.services.TemplateLocator; - +// Jetspeed modules +import org.apache.jetspeed.services.TemplateLocator; import org.apache.jetspeed.om.security.JetspeedUser; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.security.nosecurity.FakeJetspeedUser; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.services.resources.JetspeedResources; @@ -97,6 +98,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JLoginUser.class.getName()); + + /** * called when the password reminder button is pressed. * sends a user their password **/ @@ -118,8 +124,8 @@ { data.setScreenTemplate("LoginHelp"); data.setMessage(Localization.getString("JLOGINUSER_PASSWORDREMINDER_INVALIDUSER")); - if (Log.getLogger().isDebugEnabled()) - Log.debug(Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_INVALIDUSER")); + if (logger.isDebugEnabled()) + logger.debug(Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_INVALIDUSER")); return; } @@ -164,15 +170,15 @@ se.send(); data.setMessage (Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_SENT")); - Log.info( "Password for user " + user.getUserName() + " was sent to " + user.getEmail()); - Log.info(Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_SENT")); + logger.info( "Password for user " + user.getUserName() + " was sent to " + user.getEmail()); + logger.info(Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_SENT")); data.setScreenTemplate("Login"); } catch ( Exception e ) { data.setScreenTemplate("LoginHelp"); String errorTitle = Localization.getString(rundata, "JLOGINUSER_PASSWORDREMINDER_ERROR") ; String errorMessage = errorTitle + e.toString(); - Log.warn( errorMessage, e ); + logger.warn( errorMessage, e ); data.setMessage ( errorMessage ); } } @@ -206,7 +212,7 @@ if (user == null) { - Log.warn("JLogin User: Unexpected condition : user is NULL"); + logger.warn("JLogin User: Unexpected condition : user is NULL"); return; } String confirm_value = user.getConfirmed(); @@ -255,16 +261,16 @@ if (e instanceof FailedLoginException) { - Log.info("JLoginUser: Credential Failure on login for user: " + username); + logger.info("JLoginUser: Credential Failure on login for user: " + username); data.setMessage(Localization.getString(rundata, "PASSWORDFORM_FAILED_MSG")); } else if (e instanceof AccountExpiredException) { - Log.info("JLoginUser: Account Expired for user " + username); + logger.info("JLoginUser: Account Expired for user " + username); } else if (e instanceof CredentialExpiredException) { - Log.info("JLoginUser: Credentials expired for user: " + username); + logger.info("JLoginUser: Credentials expired for user: " + username); data.setScreenTemplate( JetspeedResources.getString(JetspeedResources.CHANGE_PASSWORD_TEMPLATE, "ChangePassword") ); Index: org/apache/jetspeed/modules/actions/JLogoutUser.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLogoutUser.java,v retrieving revision 1.8 diff -u -r1.8 JLogoutUser.java --- org/apache/jetspeed/modules/actions/JLogoutUser.java 4 Mar 2003 00:04:52 -0000 1.8 +++ org/apache/jetspeed/modules/actions/JLogoutUser.java 19 Jul 2003 21:47:04 -0000 @@ -61,11 +61,12 @@ // Turbine Modules import org.apache.turbine.modules.ActionEvent; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.TurbineConstants; // Jetspeed Stuff +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.services.JetspeedSecurity; import org.apache.jetspeed.util.template.JetspeedLink; @@ -80,9 +81,14 @@ public class JLogoutUser extends ActionEvent { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JLogoutUser.class.getName()); + public void doPerform( RunData data ) throws Exception { - Log.info("Entering action JLogoutUser"); + logger.info("Entering action JLogoutUser"); // if automatic login is enabled, then remove cookies when user logs out if ( JetspeedResources.getBoolean("automatic.logon.enable", false) ) @@ -144,7 +150,7 @@ jsLink = JetspeedLinkFactory.getInstance(data); } catch (Exception e) { - Log.error(e); + logger.error("Error getting jsLink", e); } data.setRedirectURI(jsLink.getHomePage().toString()); JetspeedLinkFactory.putInstance(jsLink); Index: org/apache/jetspeed/modules/actions/JetspeedAccessController.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedAccessController.java,v retrieving revision 1.8 diff -u -r1.8 JetspeedAccessController.java --- org/apache/jetspeed/modules/actions/JetspeedAccessController.java 19 Jun 2003 23:28:20 -0000 1.8 +++ org/apache/jetspeed/modules/actions/JetspeedAccessController.java 19 Jul 2003 21:47:04 -0000 @@ -56,9 +56,10 @@ import org.apache.turbine.util.RunData; import org.apache.turbine.modules.Action; -import org.apache.turbine.util.Log; import org.apache.turbine.TurbineConstants; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.services.Profiler; import org.apache.jetspeed.services.resources.JetspeedResources; @@ -78,6 +79,12 @@ public class JetspeedAccessController extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedAccessController.class.getName()); + public void doPerform( RunData data ) throws Exception { JetspeedUser user = (JetspeedUser)data.getUser(); @@ -91,7 +98,7 @@ } catch (ClassCastException e) { - Log.error("The RunData object does not implement the expected interface, " + logger.error("The RunData object does not implement the expected interface, " + "please verify the RunData factory settings", e); return; } Index: org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java,v retrieving revision 1.24 diff -u -r1.24 JetspeedSessionValidator.java --- org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java 19 Jun 2003 23:28:20 -0000 1.24 +++ org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java 19 Jul 2003 21:47:04 -0000 @@ -57,12 +57,13 @@ import java.util.Locale; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; import org.apache.turbine.services.resources.TurbineResources; import org.apache.turbine.services.localization.LocalizationService; import org.apache.turbine.TurbineConstants; import org.apache.jetspeed.om.security.JetspeedUser; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.JetspeedSecurity; import org.apache.jetspeed.services.security.LoginException; import org.apache.jetspeed.services.rundata.JetspeedRunData; @@ -89,6 +90,12 @@ public class JetspeedSessionValidator extends TemplateSessionValidator { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedSessionValidator.class.getName()); + /** * Execute the action. * @@ -154,7 +161,7 @@ } catch (ClassCastException e) { - Log.error("The RunData object does not implement the expected interface, " + logger.error("The RunData object does not implement the expected interface, " + "please verify the RunData factory settings", e); return; } Index: org/apache/jetspeed/modules/actions/NTLMSessionValidator.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/NTLMSessionValidator.java,v retrieving revision 1.3 diff -u -r1.3 NTLMSessionValidator.java --- org/apache/jetspeed/modules/actions/NTLMSessionValidator.java 8 Jul 2003 18:29:15 -0000 1.3 +++ org/apache/jetspeed/modules/actions/NTLMSessionValidator.java 19 Jul 2003 21:47:05 -0000 @@ -61,13 +61,14 @@ // Turbine APIs import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; import org.apache.turbine.services.resources.TurbineResources; import org.apache.turbine.services.localization.LocalizationService; // Jetspeed APIs import org.apache.jetspeed.om.security.JetspeedUser; import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.security.LoginException; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.util.ServiceUtil; @@ -142,6 +143,11 @@ private static final String encodedMsg1 = "NTLM " + new sun.misc.BASE64Encoder().encodeBuffer(msg1).trim(); /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(NTLMSessionValidator.class.getName()); + + /** * Execute the action. * * @param data Turbine information. @@ -189,7 +195,7 @@ { JetspeedSecurityCache.load(userName); } - Log.info("NTLMSessionValidator: automatic login using [" + userName + "]"); + logger.info("NTLMSessionValidator: automatic login using [" + userName + "]"); } catch (LoginException noSuchUser) { @@ -198,9 +204,9 @@ catch (UnknownUserException unknownUser) { //user not found - ignore it - they will not be logged in automatically - if (Log.getLogger().isWarnEnabled()) + if (logger.isWarnEnabled()) { - Log.warn("NTLMSessionValidator: username [" + userName + "] does not exist or authentication failed, " + logger.warn("NTLMSessionValidator: username [" + userName + "] does not exist or authentication failed, " + "redirecting to anon profile"); } } @@ -217,7 +223,7 @@ } catch (ClassCastException e) { - Log.error("The RunData object does not implement the expected interface, " + logger.error("The RunData object does not implement the expected interface, " + "please verify the RunData factory settings"); return; } Index: org/apache/jetspeed/modules/actions/SendConfirmationEmail.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/SendConfirmationEmail.java,v retrieving revision 1.17 diff -u -r1.17 SendConfirmationEmail.java --- org/apache/jetspeed/modules/actions/SendConfirmationEmail.java 9 Jul 2003 16:23:42 -0000 1.17 +++ org/apache/jetspeed/modules/actions/SendConfirmationEmail.java 19 Jul 2003 21:47:05 -0000 @@ -60,6 +60,8 @@ // Jetspeed Stuff import org.apache.jetspeed.services.TemplateLocator; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.services.JetspeedSecurity; import org.apache.jetspeed.om.security.JetspeedUser; @@ -71,7 +73,6 @@ import org.apache.turbine.util.RunData; import org.apache.turbine.util.DynamicURI; import org.apache.turbine.util.mail.SimpleEmail; -import org.apache.turbine.util.Log; // Velocity Stuff import org.apache.velocity.context.Context; @@ -88,6 +89,12 @@ */ public class SendConfirmationEmail extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(SendConfirmationEmail.class.getName()); + public void doPerform( RunData data ) throws Exception { JetspeedUser user = JetspeedSecurity.getUser(data.getParameters().getString("username", "")); @@ -125,9 +132,9 @@ catch ( Exception e ) { String errorTitle = Localization.getString("SENDCONFIRMATIONEMAIL_ERROR") ; - String errorMessage = errorTitle + e.toString(); + String errorMessage = errorTitle + e.getMessage(); - Log.error( errorMessage ); + logger.error( errorMessage, e ); data.setMessage ( errorTitle + errorMessage ); } } Index: org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java,v retrieving revision 1.3 diff -u -r1.3 SendNewUserNotificationEmail.java --- org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java 9 Jul 2003 16:23:42 -0000 1.3 +++ org/apache/jetspeed/modules/actions/SendNewUserNotificationEmail.java 19 Jul 2003 21:47:05 -0000 @@ -63,6 +63,8 @@ import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.services.TemplateLocator; import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.om.security.JetspeedUser; // Turbine Stuff @@ -72,7 +74,6 @@ import org.apache.turbine.util.RunData; import org.apache.turbine.util.DynamicURI; import org.apache.turbine.util.mail.SimpleEmail; -import org.apache.turbine.util.Log; // Velocity Stuff import org.apache.velocity.context.Context; @@ -89,6 +90,11 @@ */ public class SendNewUserNotificationEmail extends Action { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(SendNewUserNotificationEmail.class.getName()); + public void doPerform( RunData data ) throws Exception { JetspeedUser user = JetspeedSecurity.getUser(data.getParameters().getString("username", "")); @@ -131,9 +137,9 @@ } catch ( Exception e ) { String errorTitle = Localization.getString(data, "SENDCONFIRMATIONEMAIL_ERROR") ; - String errorMessage = errorTitle + e.toString(); + String errorMessage = errorTitle + e.getMessage(); - Log.error( errorMessage ); + logger.error( errorMessage, e ); data.setMessage ( errorTitle + errorMessage ); } } Index: org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v retrieving revision 1.28 diff -u -r1.28 MultiColumnControllerAction.java --- org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java 9 Jul 2003 16:23:43 -0000 1.28 +++ org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java 19 Jul 2003 21:47:06 -0000 @@ -69,6 +69,8 @@ import org.apache.jetspeed.portal.Portlet; import org.apache.jetspeed.portal.PortletSet; import org.apache.jetspeed.portal.PortletController; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.services.statemanager.SessionState; @@ -77,7 +79,6 @@ // Turbine stuff import org.apache.turbine.modules.ActionLoader; import org.apache.turbine.services.localization.Localization; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Velocity Stuff @@ -108,6 +109,11 @@ private static final String REFERENCES_REMOVED = "references-removed"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(MultiColumnControllerAction.class.getName()); + + /** * Subclasses must override this method to provide default behavior * for the portlet action */ @@ -175,8 +181,8 @@ rowNum = row; } - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("Controller calculated setSize " + set.size() + " row " + row + " colNum: " + colNum + " rowNum: " + rowNum); + if ( logger.isDebugEnabled() ) { + logger.debug("Controller calculated setSize " + set.size() + " row " + row + " colNum: " + colNum + " rowNum: " + rowNum); } // initialize the result position table and the work list List[] table = new List[colNum]; @@ -240,7 +246,7 @@ } } - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { dumpColumns(table); } @@ -249,7 +255,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } @@ -298,8 +304,8 @@ .getDocument() .getPortletsById(customizedSet.getID()); - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("MultiCol: columns " + columns + " set " + set); + if ( logger.isDebugEnabled() ) { + logger.debug("MultiCol: columns " + columns + " set " + set); } if ((columns != null) && (columns.length == colNum)) @@ -310,13 +316,13 @@ eCount += columns[i].size(); } - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("MultiCol: eCount " + eCount + " setCount" + set.getEntryCount() + set.getPortletsCount()); + if ( logger.isDebugEnabled() ) { + logger.debug("MultiCol: eCount " + eCount + " setCount" + set.getEntryCount() + set.getPortletsCount()); } if (eCount != set.getEntryCount() + set.getPortletsCount()) { - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("MultiCol: rebuilding columns "); + if ( logger.isDebugEnabled() ) { + logger.debug("MultiCol: rebuilding columns "); } columns = buildColumns(set, colNum); } @@ -324,8 +330,8 @@ } else { - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("MultiCol: rebuilding columns "); + if ( logger.isDebugEnabled() ) { + logger.debug("MultiCol: rebuilding columns "); } columns = buildColumns(set, colNum); } @@ -393,7 +399,7 @@ } catch (Exception e) { - Log.error("Unable to load action controls.EndCustomize ", e); + logger.error("Unable to load action controls.EndCustomize ", e); } } } @@ -434,7 +440,7 @@ } catch (Exception e) { - Log.error("Unable to save profile ", e); + logger.error("Unable to save profile ", e); } try @@ -443,7 +449,7 @@ } catch (Exception e) { - Log.error("Unable to load action controls.EndCustomize ", e); + logger.error("Unable to load action controls.EndCustomize ", e); } } } @@ -506,7 +512,7 @@ catch (Exception e) { // probably got wrong coordinates - Log.error("MultiColumnControllerAction: Probably got wrong coordinates", e); + logger.error("MultiColumnControllerAction: Probably got wrong coordinates", e); } } } @@ -617,7 +623,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } @@ -752,8 +758,8 @@ rowNum = row; } - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("Controller customize colNum: " + colNum + " rowNum: " + rowNum); + if ( logger.isDebugEnabled() ) { + logger.debug("Controller customize colNum: " + colNum + " rowNum: " + rowNum); } // initialize the result position table and the work list List[] table = new List[colNum]; @@ -787,8 +793,8 @@ { if (table[col].get(row) == null) { - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("Set portlet at col " + col + " row " + row); + if ( logger.isDebugEnabled() ) { + logger.debug("Set portlet at col " + col + " row " + row); } table[col].set(row, i.next()); } @@ -798,15 +804,15 @@ // now cleanup any remaining null elements for (int j = 0; j < table.length; j++) { - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("Column " + j); + if ( logger.isDebugEnabled() ) { + logger.debug("Column " + j); } i = table[j].iterator(); while (i.hasNext()) { Object obj = i.next(); - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("Element " + obj); + if ( logger.isDebugEnabled() ) { + logger.debug("Element " + obj); } if (obj == null) { @@ -897,8 +903,8 @@ } } - if ( Log.getLogger().isDebugEnabled() ) { - Log.debug("Constraints col " + col + " row " + row); + if ( logger.isDebugEnabled() ) { + logger.debug("Constraints col " + col + " row " + row); } if ((row >= 0) && (col >= 0) && (col < columnCount)) { @@ -925,10 +931,10 @@ { for (int i = 0; i < cols.length; i++) { - Log.debug("Column " + i); + logger.debug("Column " + i); for (int j = 0; j < cols[i].size(); j++) { - Log.debug("Row " + j + " object: " + cols[i].get(j)); + logger.debug("Row " + j + " object: " + cols[i].get(j)); } } } Index: org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java,v retrieving revision 1.18 diff -u -r1.18 RowColumnControllerAction.java --- org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java 4 Mar 2003 00:04:53 -0000 1.18 +++ org/apache/jetspeed/modules/actions/controllers/RowColumnControllerAction.java 19 Jul 2003 21:47:07 -0000 @@ -63,13 +63,14 @@ import org.apache.jetspeed.om.profile.psml.PsmlLayout; import org.apache.jetspeed.portal.PortletSet; import org.apache.jetspeed.portal.PortletController; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.util.AutoProfile; // Turbine stuff //import org.apache.turbine.util.DynamicURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.modules.ActionLoader; @@ -98,6 +99,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(RowColumnControllerAction.class.getName()); + + /** * Subclasses must override this method to provide default behavior * for the portlet action */ @@ -157,17 +163,17 @@ for (int i=0; i < portlets.getPortletsCount(); i++) { Portlets p = portlets.getPortlets(i); - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("RowColumnControllerAction: processing portlet: " + p.getTitle()); + logger.debug("RowColumnControllerAction: processing portlet: " + p.getTitle()); } Layout layout = p.getLayout(); if (layout == null) { // Pane should always have a layout with correct position - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("RowColumnControllerAction: no layout, creating a new one"); + logger.debug("RowColumnControllerAction: no layout, creating a new one"); } layout = new PsmlLayout(); layout.setPosition(i); @@ -178,9 +184,9 @@ try { int pos = (int)layout.getPosition(); - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("RowColumnControllerAction: layout has position: " + pos); + logger.debug("RowColumnControllerAction: layout has position: " + pos); } if (pos >= 0 && pos < plist.size()) { @@ -193,7 +199,7 @@ } catch (Exception e) { - Log.error(e.toString()); + logger.error("Layout error", e); layout.setPosition(-1); work.add(p); } @@ -314,7 +320,7 @@ } catch (Exception e) { - Log.error("Unable to load action controls.EndCustomize ",e); + logger.error("Unable to load action controls.EndCustomize ",e); } } } @@ -339,7 +345,7 @@ } catch (Exception e) { - Log.error("Unable to save profile ",e); + logger.error("Unable to save profile ",e); } try @@ -348,7 +354,7 @@ } catch (Exception e) { - Log.error("Unable to load action controls.EndCustomize ",e); + logger.error("Unable to load action controls.EndCustomize ",e); } } } Index: org/apache/jetspeed/modules/actions/controls/Customize.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Customize.java,v retrieving revision 1.15 diff -u -r1.15 Customize.java --- org/apache/jetspeed/modules/actions/controls/Customize.java 15 Jan 2003 18:01:28 -0000 1.15 +++ org/apache/jetspeed/modules/actions/controls/Customize.java 19 Jul 2003 21:47:07 -0000 @@ -57,7 +57,6 @@ // Turbine stuff import org.apache.turbine.modules.Action; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; // Jetspeed stuff import org.apache.jetspeed.portal.Portlet; @@ -66,6 +65,8 @@ import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.om.profile.Profile; import org.apache.jetspeed.om.profile.ProfileLocator; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Profiler; import org.apache.jetspeed.services.statemanager.SessionState; import org.apache.jetspeed.util.template.JetspeedLink; @@ -86,6 +87,12 @@ */ public class Customize extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(Customize.class.getName()); + /** * @param rundata The RunData object for the current request */ @@ -206,7 +213,7 @@ } catch (Exception e) { - Log.warn(e.toString()); + logger.warn(e.toString()); portalResource.setOwner(null); } @@ -214,7 +221,7 @@ portalResource, JetspeedSecurity.PERMISSION_CUSTOMIZE)) { - Log.warn("User " + jdata.getUser().getUserName() + " has no customize permission for portlet with id " + peid); + logger.warn("User " + jdata.getUser().getUserName() + " has no customize permission for portlet with id " + peid); jdata.setMessage("Sorry, you have no customize permission for this portlet"); return; } @@ -239,7 +246,7 @@ } catch (Exception e) { - Log.error("Error while saving profile", e); + logger.error("Error while saving profile", e); } } // save @@ -267,7 +274,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("exit error", e); } data.setRedirectURI(jsLink.toString()); JetspeedLinkFactory.putInstance(jsLink); Index: org/apache/jetspeed/modules/actions/controls/EndCustomize.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/EndCustomize.java,v retrieving revision 1.2 diff -u -r1.2 EndCustomize.java --- org/apache/jetspeed/modules/actions/controls/EndCustomize.java 25 Mar 2003 18:39:56 -0000 1.2 +++ org/apache/jetspeed/modules/actions/controls/EndCustomize.java 19 Jul 2003 21:47:08 -0000 @@ -58,9 +58,10 @@ import org.apache.turbine.modules.Action; import org.apache.turbine.util.DynamicURI; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; // Jetspeed stuff +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedLinkFactory; @@ -75,6 +76,12 @@ */ public class EndCustomize extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(EndCustomize.class.getName()); + /** * @param rundata The RunData object for the current request */ @@ -86,7 +93,7 @@ try { - JetspeedLink jsLink = JetspeedLinkFactory.getInstance(data); + JetspeedLink jsLink = JetspeedLinkFactory.getInstance(data); DynamicURI duri = jsLink.getLink(JetspeedLink.CURRENT,null,null,JetspeedLink.CURRENT,null); String mtype = data.getParameters().getString("mtype"); if (mtype != null) @@ -112,7 +119,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Error while trying to bring user back to home page", e); } } } Index: org/apache/jetspeed/modules/actions/controls/Maximize.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Maximize.java,v retrieving revision 1.11 diff -u -r1.11 Maximize.java --- org/apache/jetspeed/modules/actions/controls/Maximize.java 4 Mar 2003 00:04:53 -0000 1.11 +++ org/apache/jetspeed/modules/actions/controls/Maximize.java 19 Jul 2003 21:47:08 -0000 @@ -57,9 +57,10 @@ // Turbine stuff import org.apache.turbine.modules.Action; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; // Jetspeed stuff +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.om.profile.Entry; @@ -75,6 +76,12 @@ */ public class Maximize extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(Maximize.class.getName()); + /** * @param rundata The RunData object for the current request */ @@ -99,7 +106,7 @@ Entry entry = jdata.getProfile().getDocument().getEntryById(peid); if ( entry == null ) { - Log.warn("Failed to get PEID (" + peid + ") entry for User (" + logger.warn("Failed to get PEID (" + peid + ") entry for User (" + rundata.getUser().getName() + ")"); return; } Index: org/apache/jetspeed/modules/actions/controls/Minimize.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Minimize.java,v retrieving revision 1.8 diff -u -r1.8 Minimize.java --- org/apache/jetspeed/modules/actions/controls/Minimize.java 24 Oct 2002 08:47:42 -0000 1.8 +++ org/apache/jetspeed/modules/actions/controls/Minimize.java 19 Jul 2003 21:47:08 -0000 @@ -56,12 +56,13 @@ // Turbine stuff import org.apache.turbine.modules.Action; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Jetspeed stuff import org.apache.jetspeed.portal.Portlet; import org.apache.jetspeed.portal.PortletState; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.PortletFactory; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.om.profile.Entry; @@ -74,6 +75,12 @@ */ public class Minimize extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(Minimize.class.getName()); + /** * @param rundata The RunData object for the current request */ @@ -98,9 +105,9 @@ Entry entry = jdata.getProfile().getDocument().getEntryById(peid); if ( entry == null ) { - if (Log.getLogger().isWarnEnabled()) + if (logger.isWarnEnabled()) { - Log.warn("Failed to get PEID (" + peid + ") entry for User (" + logger.warn("Failed to get PEID (" + peid + ") entry for User (" + rundata.getUser().getName() + ")"); } return; @@ -110,10 +117,10 @@ // Now set the portlet to minimized if (( portlet != null )&&( portlet instanceof PortletState )) { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("peid = " + peid); - Log.debug("portlet id = " + portlet.getID()); + logger.debug("peid = " + peid); + logger.debug("portlet id = " + portlet.getID()); } if (portlet.getID().equals(peid)) { Index: org/apache/jetspeed/modules/actions/controls/Restore.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/Restore.java,v retrieving revision 1.12 diff -u -r1.12 Restore.java --- org/apache/jetspeed/modules/actions/controls/Restore.java 28 Jun 2002 05:37:28 -0000 1.12 +++ org/apache/jetspeed/modules/actions/controls/Restore.java 19 Jul 2003 21:47:08 -0000 @@ -56,12 +56,13 @@ // Turbine stuff import org.apache.turbine.modules.Action; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Jetspeed stuff import org.apache.jetspeed.portal.Portlet; import org.apache.jetspeed.portal.PortletState; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.PortletFactory; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.om.profile.Entry; @@ -74,6 +75,12 @@ */ public class Restore extends Action { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(Restore.class.getName()); + /** * @param rundata The RunData object for the current request */ @@ -97,7 +104,7 @@ Entry entry = jdata.getProfile().getDocument().getEntryById(peid); if ( entry == null ) { - Log.warn("Failed to get PEID (" + peid + ") entry for User (" + logger.warn("Failed to get PEID (" + peid + ") entry for User (" + rundata.getUser().getName() + ")"); return; } Index: org/apache/jetspeed/modules/actions/portlets/ClientUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/ClientUpdateAction.java,v retrieving revision 1.2 diff -u -r1.2 ClientUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/ClientUpdateAction.java 2 May 2003 19:23:48 -0000 1.2 +++ org/apache/jetspeed/modules/actions/portlets/ClientUpdateAction.java 19 Jul 2003 21:47:09 -0000 @@ -53,15 +53,21 @@ */ package org.apache.jetspeed.modules.actions.portlets; +// Jetspeed classes import org.apache.jetspeed.modules.actions.portlets.security.SecurityConstants; import org.apache.jetspeed.om.registry.ClientEntry; import org.apache.jetspeed.om.registry.RegistryEntry; import org.apache.jetspeed.portal.portlets.VelocityPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; + +// Regexp classes import org.apache.regexp.RE; import org.apache.regexp.RESyntaxException; + +// Trubine classes import org.apache.turbine.util.DynamicURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; @@ -74,7 +80,12 @@ public class ClientUpdateAction extends RegistryUpdateAction { private static final String whoAmI = "ClientUpdateAction: "; - private static final String CLIENT_UPDATE_PANE = "ClientForm"; + private static final String CLIENT_UPDATE_PANE = "ClientForm"; + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ClientUpdateAction.class.getName()); public ClientUpdateAction() { @@ -146,7 +157,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to add mime type"); + logger.error(this.getClass().getName() + ": Failed to find registry entry while trying to add mime type"); } } catch (Exception e) @@ -155,7 +166,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Error addin mime type", e); } } @@ -199,7 +210,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to remove mime types"); + logger.error(this.getClass().getName() + ": Failed to find registry entry while trying to remove mime types"); } } catch (Exception e) @@ -208,7 +219,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Error removing mime types", e); } } @@ -247,8 +258,8 @@ } catch(RESyntaxException e) { - Log.error(whoAmI + "Illegal regular expression syntax " + userAgentPattern + " for user agent"); - Log.debug(whoAmI + "Illegal regular expression syntax for user agent", e); + logger.error(whoAmI + "Illegal regular expression syntax " + userAgentPattern + " for user agent"); + logger.debug(whoAmI + "Illegal regular expression syntax for user agent", e); throw new IllegalArgumentException("Illegal regular expression syntax for user agent"); } @@ -298,25 +309,26 @@ * @param rundata The turbine rundata context for this request. */ protected void clearUserData(RunData rundata) + { + try { - try - { super.clearUserData(rundata); - rundata.getUser().removeTemp("user_agent_pattern"); - rundata.getUser().removeTemp("manufacturer"); - rundata.getUser().removeTemp("model"); - rundata.getUser().removeTemp("version"); + rundata.getUser().removeTemp("user_agent_pattern"); + rundata.getUser().removeTemp("manufacturer"); + rundata.getUser().removeTemp("model"); + rundata.getUser().removeTemp("version"); - rundata.getUser().removeTemp("capability"); + rundata.getUser().removeTemp("capability"); rundata.getUser().removeTemp("mime_type"); - } - catch (Exception e) - { - if (Log.getLogger().isDebugEnabled()) - { - Log.debug("ClientUpdateAction: Failed to clear user data"); - } - } - } + } + catch (Exception e) + { + + if (logger.isDebugEnabled()) + { + logger.debug("ClientUpdateAction: Failed to clear user data"); + } + } + } } Index: org/apache/jetspeed/modules/actions/portlets/ControllerUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/ControllerUpdateAction.java,v retrieving revision 1.1 diff -u -r1.1 ControllerUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/ControllerUpdateAction.java 2 May 2003 20:36:37 -0000 1.1 +++ org/apache/jetspeed/modules/actions/portlets/ControllerUpdateAction.java 19 Jul 2003 21:47:09 -0000 @@ -57,8 +57,10 @@ import org.apache.jetspeed.om.registry.PortletControllerEntry; import org.apache.jetspeed.om.registry.RegistryEntry; import org.apache.jetspeed.portal.portlets.VelocityPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; + import org.apache.jetspeed.services.Registry; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; @@ -71,6 +73,11 @@ public class ControllerUpdateAction extends RegistryUpdateAction { private static final String CONTROLLER_UPDATE_PANE = "ControllerForm"; + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ControllerUpdateAction.class.getName()); public ControllerUpdateAction() { @@ -136,9 +143,9 @@ } catch (Exception e) { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("ControllerUpdateAction: Failed to clear user data"); + logger.debug("ControllerUpdateAction: Failed to clear user data"); } } Index: org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java,v retrieving revision 1.25 diff -u -r1.25 CustomizeAction.java --- org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java 16 Jul 2003 02:23:08 -0000 1.25 +++ org/apache/jetspeed/modules/actions/portlets/CustomizeAction.java 19 Jul 2003 21:47:09 -0000 @@ -76,13 +76,14 @@ import org.apache.jetspeed.om.security.JetspeedUser; import org.apache.jetspeed.services.JetspeedSecurity; import org.apache.jetspeed.services.PortalToolkit; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.security.PortalResource; import org.apache.jetspeed.portal.PortletInstance; import org.apache.jetspeed.util.MetaData; import org.apache.jetspeed.services.statemanager.SessionState; // Turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.modules.ActionLoader; @@ -106,6 +107,11 @@ public static final String PARAM_NAMESPACE = "_param_"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(CustomizeAction.class.getName()); + + /** * Subclasses must override this method to provide default behavior * for the portlet action * @@ -220,7 +226,7 @@ } catch (Exception e) { - Log.error("Unable to load action controls.EndCustomize ",e); + logger.error("Unable to load action controls.EndCustomize ",e); } } } @@ -250,7 +256,7 @@ } catch (Exception e) { - Log.error("Unable to save profile ",e); + logger.error("Unable to save profile ",e); } //FIXME: this hack is due to the corrupted lifecycle of the portlet in the @@ -262,7 +268,7 @@ } catch (PortletException e) { - Log.error("Customizer failed to reinitialize the portlet "+p.getName(), e); + logger.error("Customizer failed to reinitialize the portlet "+p.getName(), e); } // we're done, make sure clean up the @@ -271,7 +277,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } @@ -375,7 +381,7 @@ } else { - Log.warn( "Unable to update skin for portlet entry " + entry.getId() + " because skin " + skin + " does not exist."); + logger.warn( "Unable to update skin for portlet entry " + entry.getId() + " because skin " + skin + " does not exist."); } } else @@ -487,11 +493,11 @@ } catch (PortletException e) { - Log.error("Customizer failed to reinitialize the portlet "+p.getName(), e); + logger.error("Customizer failed to reinitialize the portlet "+p.getName(), e); } catch (Exception e) { - Log.error("Unable to save profile ",e); + logger.error("Unable to save profile ",e); } } @@ -501,7 +507,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } } Index: org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v retrieving revision 1.45 diff -u -r1.45 CustomizeSetAction.java --- org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java 17 Jul 2003 00:08:53 -0000 1.45 +++ org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java 19 Jul 2003 21:47:11 -0000 @@ -93,6 +93,8 @@ import org.apache.jetspeed.om.security.JetspeedUser; import org.apache.jetspeed.services.idgenerator.JetspeedIdGenerator; import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.security.PortalResource; import org.apache.jetspeed.util.AutoProfile; import org.apache.jetspeed.util.PortletSessionState; @@ -103,7 +105,6 @@ // Turbine stuff import org.apache.turbine.util.DynamicURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.services.localization.Localization; @@ -142,6 +143,11 @@ private static final String PORTLET_LIST_PAGE_SIZE = "session.portlets.page.size"; private static final String HIDE_EMPTY_CATEGORIES = "customizer.hide.empty.categories"; + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(CustomizeSetAction.class.getName()); + /** * Subclasses must override this method to provide default behavior * for the portlet action @@ -427,7 +433,7 @@ } catch (Exception e) { - Log.debug("CustomizeSetAction: Init param 'size' not parsed"); + logger.debug("CustomizeSetAction: Init param 'size' not parsed"); } return size; } @@ -462,7 +468,7 @@ } catch (Exception e) { - Log.error("Exception occured while saving PSML", e); + logger.error("Exception occured while saving PSML", e); } } @@ -495,9 +501,9 @@ ((JetspeedRunData) rundata).getCustomizedProfile()); if (defaultRef != null) { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("CustomizeSetAction: setting default portlet set security to [" + defaultRef.getParent() + "]"); + logger.debug("CustomizeSetAction: setting default portlet set security to [" + defaultRef.getParent() + "]"); } p.setSecurityRef(defaultRef); } @@ -744,9 +750,9 @@ String message = MessageFormat.format(tmpl, args).toString(); rundata.addMessage(message.concat("
")); - if (Log.getLogger().isWarnEnabled()) + if (logger.isWarnEnabled()) { - Log.warn(message); + logger.warn(message); } } } @@ -791,7 +797,7 @@ } catch (ProfileException e) { - Log.error(e); + logger.error("Exception", e); } return null; } @@ -873,7 +879,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } @@ -912,7 +918,7 @@ } else { - Log.warn("Unable to update skin for portlet set " + logger.warn("Unable to update skin for portlet set " + set.getID() + " because skin " + skin + " does not exist."); return; @@ -927,7 +933,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } @@ -960,7 +966,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } Index: org/apache/jetspeed/modules/actions/portlets/GenericMVCAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/GenericMVCAction.java,v retrieving revision 1.3 diff -u -r1.3 GenericMVCAction.java --- org/apache/jetspeed/modules/actions/portlets/GenericMVCAction.java 14 Jul 2003 14:03:54 -0000 1.3 +++ org/apache/jetspeed/modules/actions/portlets/GenericMVCAction.java 19 Jul 2003 21:47:11 -0000 @@ -62,12 +62,13 @@ import org.apache.jetspeed.portal.PortletInstance; import org.apache.jetspeed.portal.portlets.GenericMVCContext; import org.apache.jetspeed.portal.portlets.GenericMVCPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.persistence.PersistenceManager; import org.apache.jetspeed.services.persistence.PortalPersistenceException; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.util.PortletSessionState; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; @@ -86,6 +87,11 @@ extends PortletAction { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(GenericMVCAction.class.getName()); + /** Creates a new instance of GenericMVCAction */ public GenericMVCAction() { @@ -105,7 +111,7 @@ // if context is already defined and Actions defined, events // have already been processed, call doPerform - Log.debug("Action detected with action + context"); + logger.debug("Action detected with action + context"); doPerform(rundata, context); } else @@ -114,7 +120,7 @@ // if context is null, create a new one if (context == null) { - Log.debug("Action: building action context"); + logger.debug("Action: building action context"); context = new GenericMVCContext(); rundata.getTemplateInfo().setTemplateContext("VelocityActionContext", context); } @@ -123,7 +129,7 @@ { // process implicit ActionEvent invocation - Log.debug("Action: try executing events"); + logger.debug("Action: try executing events"); GenericMVCPortlet portlet = (GenericMVCPortlet) context.get("portlet"); @@ -139,7 +145,7 @@ } else { - Log.debug("Action: calling doPerform"); + logger.debug("Action: calling doPerform"); doPerform(rundata, context); } } @@ -152,7 +158,7 @@ { // no event selected, process normal context generation - Log.debug("Action: calling doPerform"); + logger.debug("Action: calling doPerform"); } @@ -166,14 +172,14 @@ GenericMVCPortlet portlet = null; JetspeedRunData jdata = (JetspeedRunData) rundata; - Log.debug("GenericMVCAction: retrieved context: " + context); + logger.debug("GenericMVCAction: retrieved context: " + context); if (context != null) { portlet = (GenericMVCPortlet) context.get("portlet"); } - Log.debug("GenericMVCAction: retrieved portlet: " + portlet); + logger.debug("GenericMVCAction: retrieved portlet: " + portlet); if (portlet != null) { @@ -183,7 +189,7 @@ // we're bein configured if ((jdata.getMode() == jdata.CUSTOMIZE) && (portlet.getName().equals(jdata.getCustomized().getName()))) { - Log.debug("GenericMVCAction: building customize"); + logger.debug("GenericMVCAction: building customize"); buildConfigureContext(portlet, context, rundata); return; @@ -192,13 +198,13 @@ // we're maximized if (jdata.getMode() == jdata.MAXIMIZE) { - Log.debug("GenericMVCAction: building maximize"); + logger.debug("GenericMVCAction: building maximize"); buildMaximizedContext(portlet, context, rundata); return; } - Log.debug("GenericMVCAction: building normal"); + logger.debug("GenericMVCAction: building normal"); buildNormalContext(portlet, context, rundata); } } Index: org/apache/jetspeed/modules/actions/portlets/IndexPortletRegistry.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/IndexPortletRegistry.java,v retrieving revision 1.2 diff -u -r1.2 IndexPortletRegistry.java --- org/apache/jetspeed/modules/actions/portlets/IndexPortletRegistry.java 20 Jun 2003 17:05:48 -0000 1.2 +++ org/apache/jetspeed/modules/actions/portlets/IndexPortletRegistry.java 19 Jul 2003 21:47:12 -0000 @@ -60,12 +60,13 @@ import java.util.ArrayList; // Turbine Modules -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.jetspeed.services.search.Search; // Jetspeed Stuff import org.apache.jetspeed.om.registry.PortletEntry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.portal.Portlet; @@ -80,6 +81,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(IndexPortletRegistry.class.getName()); + + /** * Build the normal state content for this portlet. * * @param portlet The jsp-based portlet that is being built. @@ -122,7 +128,7 @@ } catch (Throwable e) { - Log.error(e); + logger.error("Throwable", e); } try @@ -132,7 +138,7 @@ } catch (Throwable e) { - Log.error(e); + logger.error("Throwable", e); } } Index: org/apache/jetspeed/modules/actions/portlets/JspStockQuoteAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/JspStockQuoteAction.java,v retrieving revision 1.1 diff -u -r1.1 JspStockQuoteAction.java --- org/apache/jetspeed/modules/actions/portlets/JspStockQuoteAction.java 2 Jan 2003 19:19:55 -0000 1.1 +++ org/apache/jetspeed/modules/actions/portlets/JspStockQuoteAction.java 19 Jul 2003 21:47:12 -0000 @@ -55,7 +55,6 @@ package org.apache.jetspeed.modules.actions.portlets; // Turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.util.Comparable; @@ -64,6 +63,8 @@ // Jetspeed stuff import org.apache.jetspeed.portal.Portlet; import org.apache.jetspeed.modules.actions.portlets.JspPortletAction; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.webservices.finance.stockmarket.StockQuoteService; import org.apache.jetspeed.webservices.finance.stockmarket.StockQuote; import org.apache.jetspeed.util.PortletConfigState; @@ -88,6 +89,11 @@ private String sort = null; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JspStockQuoteAction.class.getName()); + + /** * Build the normal state content for this portlet. * * @param portlet The jsp-based portlet that is being built. @@ -110,7 +116,7 @@ { // We always fetch the most current quotes so might as well call refresh from here this.doRefresh(rundata, portlet); - Log.info("JspStockQuoteAction: sorting..."); + logger.info("JspStockQuoteAction: sorting..."); } /** @@ -158,11 +164,11 @@ rundata.getRequest().setAttribute(COLUMNS, selectedColumnsArray); rundata.getRequest().setAttribute(SELECTED_COLUMNS, columns); - Log.info("JspStockQuoteAction: refreshing..."); + logger.info("JspStockQuoteAction: refreshing..."); } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } Index: org/apache/jetspeed/modules/actions/portlets/PortletUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/PortletUpdateAction.java,v retrieving revision 1.4 diff -u -r1.4 PortletUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/PortletUpdateAction.java 4 Jun 2003 20:59:32 -0000 1.4 +++ org/apache/jetspeed/modules/actions/portlets/PortletUpdateAction.java 19 Jul 2003 21:47:12 -0000 @@ -66,9 +66,10 @@ import org.apache.jetspeed.om.registry.RegistryEntry; import org.apache.jetspeed.om.registry.base.BaseSecurity; import org.apache.jetspeed.portal.portlets.VelocityPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; import org.apache.turbine.util.DynamicURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.TurbineException; import org.apache.velocity.context.Context; @@ -86,6 +87,11 @@ private static final String PORTLET_NAME = "portlet_name"; private static final String TAB_PARAMETER = "tab"; + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PortletUpdateAction.class.getName()); + public PortletUpdateAction() { registryEntryName = PORTLET_NAME; @@ -295,7 +301,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to add category"); + logger.error("Failed to find registry entry while trying to add category"); } } catch (Exception e) @@ -304,7 +310,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -359,7 +365,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to remove categories"); + logger.error("Failed to find registry entry while trying to remove categories"); } } catch (Exception e) @@ -368,7 +374,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -445,9 +451,9 @@ } catch (Exception e) { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("PortletUpdateAction: Failed to clear user data"); + logger.debug("PortletUpdateAction: Failed to clear user data"); } } } Index: org/apache/jetspeed/modules/actions/portlets/PsmlBrowseAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/PsmlBrowseAction.java,v retrieving revision 1.11 diff -u -r1.11 PsmlBrowseAction.java --- org/apache/jetspeed/modules/actions/portlets/PsmlBrowseAction.java 4 Mar 2003 00:04:53 -0000 1.11 +++ org/apache/jetspeed/modules/actions/portlets/PsmlBrowseAction.java 19 Jul 2003 21:47:13 -0000 @@ -58,13 +58,14 @@ import org.apache.jetspeed.om.profile.Profile; import org.apache.jetspeed.om.profile.QueryLocator; import org.apache.jetspeed.portal.portlets.VelocityPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.portal.portlets.browser.DatabaseBrowserIterator; import org.apache.jetspeed.services.Profiler; import org.apache.jetspeed.util.PortletConfigState; import org.apache.jetspeed.util.PortletSessionState; // Turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Velocity Stuff @@ -115,6 +116,11 @@ public static final String FILTER_TYPE_GROUP = "filter_type_group"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PsmlBrowseAction.class.getName()); + + /** * Subclasses should override this method if they wish to * provide their own customization behavior. * Default is to use Portal base customizer action @@ -129,7 +135,7 @@ } catch (Exception ex) { - Log.error(ex); + logger.error("Exception", ex); } context.put(PAGE_SIZE, PortletConfigState.getParameter(portlet, rundata, PAGE_SIZE, "20")); setTemplate(rundata, PortletConfigState.getParameter(portlet, rundata, CUSTOMIZE_TEMPLATE, null)); @@ -191,7 +197,7 @@ } catch (org.apache.regexp.RESyntaxException rex) { - Log.warn("PsmlBrowseAction: error processing regular expression [" + filterValue + "]: " + + logger.warn("PsmlBrowseAction: error processing regular expression [" + filterValue + "]: " + rex.toString()); } } @@ -228,7 +234,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } } else @@ -268,7 +274,7 @@ } else { - Log.error("No Psml entries Found"); + logger.error("No Psml entries Found"); } } Index: org/apache/jetspeed/modules/actions/portlets/PsmlManagerAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/PsmlManagerAction.java,v retrieving revision 1.4 diff -u -r1.4 PsmlManagerAction.java --- org/apache/jetspeed/modules/actions/portlets/PsmlManagerAction.java 12 Jul 2003 04:11:52 -0000 1.4 +++ org/apache/jetspeed/modules/actions/portlets/PsmlManagerAction.java 19 Jul 2003 21:47:15 -0000 @@ -75,6 +75,8 @@ import org.apache.jetspeed.om.registry.PortletEntry; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.services.PsmlManager; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedLinkFactory; import org.apache.jetspeed.services.resources.JetspeedResources; @@ -85,7 +87,6 @@ import org.apache.jetspeed.services.rundata.JetspeedRunData; // Turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.DynamicURI; import org.apache.turbine.util.StringUtils; @@ -178,6 +179,11 @@ protected static final String PSML_UPDATE_PANE = "PsmlForm"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PsmlManagerAction.class.getName()); + + /** * Subclasses should override this method if they wish to * provide their own customization behavior. * Default is to use Portal base customizer action @@ -192,7 +198,7 @@ } catch (Exception ex) { - Log.error(ex); + logger.error("Exception", ex); } context.put(PAGE_SIZE, PortletConfigState.getParameter(portlet, rundata, PAGE_SIZE, "20")); setTemplate(rundata, PortletConfigState.getParameter(portlet, rundata, CUSTOMIZE_TEMPLATE, null)); @@ -467,7 +473,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } ArrayList entryType = new ArrayList(); @@ -533,7 +539,7 @@ } else { - Log.error("Profile for Path:" + path + " Not Found!"); + logger.error("Profile for Path:" + path + " Not Found!"); } } @@ -772,7 +778,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); rundata.setMessage("Error in PsmlUpdateAction: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error", "Error")); @@ -925,7 +931,7 @@ } else { - Log.error("Profile listed in Copy From Not Found!"); + logger.error("Profile listed in Copy From Not Found!"); } goBackToBrowser(rundata); @@ -933,7 +939,7 @@ catch (EntityExistsException e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -949,7 +955,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -993,13 +999,13 @@ } else { - Log.error("ProfileLocator not found!"); + logger.error("ProfileLocator not found!"); } } catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -1079,13 +1085,13 @@ } else { - Log.error("Profile listed in Copy From Not Found!"); + logger.error("Profile listed in Copy From Not Found!"); } } catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -1117,7 +1123,7 @@ { String copyTo = null; - Log.info("PsmlUpdateAction: Starting export all operation"); + logger.info("PsmlUpdateAction: Starting export all operation"); try { @@ -1176,12 +1182,12 @@ if (!this.saveDocument(copyToFile.toString(), doc)) { - Log.error("Failed to save PSML document for [" + profile.getPath()); + logger.error("Failed to save PSML document for [" + profile.getPath()); } else { String msg = "Profile [" + profile.getPath() + "] has been saved to disk in [" + copyToFile.toString() + "]
"; - Log.info(msg); + logger.info(msg); rundata.addMessage(msg); } } @@ -1191,7 +1197,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -1210,7 +1216,7 @@ rundata.getUser().setTemp(COPY_TO, copyTo); } - Log.info("PsmlUpdateAction: Ending export all operation"); + logger.info("PsmlUpdateAction: Ending export all operation"); } /** @@ -1248,23 +1254,23 @@ } catch (MarshalException e) { - Log.error("PsmlManagerAction: Could not marshal the file " + f.getAbsolutePath(), e); + logger.error("PsmlManagerAction: Could not marshal the file " + f.getAbsolutePath(), e); } catch (MappingException e) { - Log.error("PsmlManagerAction: Could not marshal the file " + f.getAbsolutePath(), e); + logger.error("PsmlManagerAction: Could not marshal the file " + f.getAbsolutePath(), e); } catch (ValidationException e) { - Log.error("PsmlManagerAction: document "+f.getAbsolutePath() + " is not valid", e); + logger.error("PsmlManagerAction: document "+f.getAbsolutePath() + " is not valid", e); } catch (IOException e) { - Log.error("PsmlManagerAction: Could not save the file " + f.getAbsolutePath(), e); + logger.error("PsmlManagerAction: Could not save the file " + f.getAbsolutePath(), e); } catch (Exception e) { - Log.error("PsmlManagerAction: Error while saving " + f.getAbsolutePath(), e); + logger.error("PsmlManagerAction: Error while saving " + f.getAbsolutePath(), e); } finally { @@ -1299,9 +1305,9 @@ if (mapFile != null) { File map = new File(mapFile); - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug( "Loading psml mapping file " + mapFile ); + logger.debug( "Loading psml mapping file " + mapFile ); } if (map.exists() && map.isFile() && map.canRead()) { @@ -1314,7 +1320,7 @@ } catch (Exception e) { - Log.error("Error in psml mapping creation", e); + logger.error("Error in psml mapping creation", e); throw new Exception("Error in mapping"); } } @@ -1458,7 +1464,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -1555,7 +1561,7 @@ } catch (Exception ouch) { - Log.error(ouch); + logger.error("Exception", ouch); rundata.addMessage("ERROR importing file [" + path + "]: " + ouch.toString() + "
"); } } @@ -1564,7 +1570,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -1625,9 +1631,9 @@ private ProfileLocator mapFileToLocator(String path) throws Exception { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("PsmlUpdateAction.createFromPath: processing path = " + path); + logger.debug("PsmlUpdateAction.createFromPath: processing path = " + path); } ProfileLocator result = Profiler.createLocator(); @@ -1818,23 +1824,23 @@ } catch (IOException e) { - Log.error("PsmlManagerAction: Could not load the file " + f.getAbsolutePath(), e); + logger.error("PsmlManagerAction: Could not load the file " + f.getAbsolutePath(), e); } catch (MarshalException e) { - Log.error("PsmlManagerAction: Could not unmarshal the file " + f.getAbsolutePath(), e); + logger.error("PsmlManagerAction: Could not unmarshal the file " + f.getAbsolutePath(), e); } catch (MappingException e) { - Log.error("PsmlManagerAction: Could not unmarshal the file " + f.getAbsolutePath(), e); + logger.error("PsmlManagerAction: Could not unmarshal the file " + f.getAbsolutePath(), e); } catch (ValidationException e) { - Log.error("PsmlManagerAction: document " + f.getAbsolutePath() + " is not valid", e); + logger.error("PsmlManagerAction: document " + f.getAbsolutePath() + " is not valid", e); } catch (Exception e) { - Log.error("PsmlManagerAction: Error while loading " + f.getAbsolutePath(), e); + logger.error("PsmlManagerAction: Error while loading " + f.getAbsolutePath(), e); } finally { Index: org/apache/jetspeed/modules/actions/portlets/PsmlUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/PsmlUpdateAction.java,v retrieving revision 1.14 diff -u -r1.14 PsmlUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/PsmlUpdateAction.java 12 Jul 2003 04:11:52 -0000 1.14 +++ org/apache/jetspeed/modules/actions/portlets/PsmlUpdateAction.java 19 Jul 2003 21:47:16 -0000 @@ -55,7 +55,6 @@ package org.apache.jetspeed.modules.actions.portlets; // Turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.DynamicURI; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; @@ -89,6 +88,8 @@ import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.services.JetspeedSecurity; import org.apache.jetspeed.services.PsmlManager; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedLinkFactory; import org.apache.jetspeed.services.resources.JetspeedResources; @@ -130,6 +131,12 @@ protected static final String COPY_TO = "copyTo"; protected static final String TEMP_LOCATOR = "tempLocator"; protected static final String PSML_UPDATE_PANE = "PsmlForm"; + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PsmlUpdateAction.class.getName()); + /** * Subclasses must override this method to provide default behavior * for the portlet action @@ -178,7 +185,7 @@ context.put("profile", profile); } else - Log.error("Profile for Path:"+path+" Not Found!"); + logger.error("Profile for Path:"+path+" Not Found!"); } if(mode != null && mode.equals(SecurityConstants.PARAM_MODE_INSERT)) @@ -406,7 +413,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); rundata.setMessage("Error in PsmlUpdateAction: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -534,13 +541,13 @@ } else { - Log.error("Profile listed in Copy From Not Found!"); + logger.error("Profile listed in Copy From Not Found!"); } } catch (EntityExistsException e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -557,7 +564,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -598,13 +605,13 @@ } else { - Log.error("ProfileLocator not found!"); + logger.error("ProfileLocator not found!"); } } catch(Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -666,13 +673,13 @@ } else { - Log.error("Profile listed in Copy From Not Found!"); + logger.error("Profile listed in Copy From Not Found!"); } } catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -705,7 +712,7 @@ { String copyTo = null; - Log.info("PsmlUpdateAction: Starting export all operation"); + logger.info("PsmlUpdateAction: Starting export all operation"); try { @@ -763,10 +770,10 @@ copyToFile.append(profile.getName()); if (!this.saveDocument(copyToFile.toString(), doc)) { - Log.error("Failed to save PSML document for [" + profile.getPath()); + logger.error("Failed to save PSML document for [" + profile.getPath()); } else { String msg = "Profile [" + profile.getPath() + "] has been saved to disk in [" + copyToFile.toString() + "]
"; - Log.info(msg); + logger.info(msg); rundata.addMessage(msg); } } @@ -776,7 +783,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -795,7 +802,7 @@ rundata.getUser().setTemp(COPY_TO, copyTo); } - Log.info("PsmlUpdateAction: Ending export all operation"); + logger.info("PsmlUpdateAction: Ending export all operation"); } /** Save the PSML document on disk to the specififed fileOrUrl @@ -831,23 +838,23 @@ } catch (MarshalException e) { - Log.error("PSMLUpdateAction: Could not marshal the file " + f.getAbsolutePath(), e); + logger.error("PSMLUpdateAction: Could not marshal the file " + f.getAbsolutePath(), e); } catch (MappingException e) { - Log.error("PSMLUpdateAction: Could not marshal the file " + f.getAbsolutePath(), e); + logger.error("PSMLUpdateAction: Could not marshal the file " + f.getAbsolutePath(), e); } catch (ValidationException e) { - Log.error("PSMLUpdateAction: document "+f.getAbsolutePath() + " is not valid", e); + logger.error("PSMLUpdateAction: document "+f.getAbsolutePath() + " is not valid", e); } catch (IOException e) { - Log.error("PSMLUpdateAction: Could not save the file " + f.getAbsolutePath(), e); + logger.error("PSMLUpdateAction: Could not save the file " + f.getAbsolutePath(), e); } catch (Exception e) { - Log.error("PSMLUpdateAction: Error while saving " + f.getAbsolutePath(), e); + logger.error("PSMLUpdateAction: Error while saving " + f.getAbsolutePath(), e); } finally { @@ -882,9 +889,9 @@ if (mapFile != null) { File map = new File(mapFile); - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug( "Loading psml mapping file " + mapFile ); + logger.debug( "Loading psml mapping file " + mapFile ); } if (map.exists() && map.isFile() && map.canRead()) { @@ -897,7 +904,7 @@ } catch (Exception e) { - Log.error("Error in psml mapping creation", e); + logger.error("Error in psml mapping creation", e); throw new Exception("Error in mapping"); } } @@ -1044,7 +1051,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -1139,7 +1146,7 @@ } catch (Exception ouch) { - Log.error(ouch); + logger.error("Exception", ouch); rundata.addMessage("ERROR importing file [" + path + "]: " + ouch.toString() + "
"); } } @@ -1148,7 +1155,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -1210,9 +1217,9 @@ private ProfileLocator mapFileToLocator(String path) throws Exception { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("PsmlUpdateAction.createFromPath: processing path = " + path); + logger.debug("PsmlUpdateAction.createFromPath: processing path = " + path); } ProfileLocator result = Profiler.createLocator(); @@ -1403,23 +1410,23 @@ } catch (IOException e) { - Log.error("PSMLUpdateAction: Could not load the file " + f.getAbsolutePath(), e); + logger.error("PSMLUpdateAction: Could not load the file " + f.getAbsolutePath(), e); } catch (MarshalException e) { - Log.error("PSMLUpdateAction: Could not unmarshal the file " + f.getAbsolutePath(), e); + logger.error("PSMLUpdateAction: Could not unmarshal the file " + f.getAbsolutePath(), e); } catch (MappingException e) { - Log.error("PSMLUpdateAction: Could not unmarshal the file " + f.getAbsolutePath(), e); + logger.error("PSMLUpdateAction: Could not unmarshal the file " + f.getAbsolutePath(), e); } catch (ValidationException e) { - Log.error("PSMLUpdateAction: document " + f.getAbsolutePath() + " is not valid", e); + logger.error("PSMLUpdateAction: document " + f.getAbsolutePath() + " is not valid", e); } catch (Exception e) { - Log.error("PSMLUpdateAction: Error while loading " + f.getAbsolutePath(), e); + logger.error("PSMLUpdateAction: Error while loading " + f.getAbsolutePath(), e); } finally { Index: org/apache/jetspeed/modules/actions/portlets/QuestionnaireAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/QuestionnaireAction.java,v retrieving revision 1.5 diff -u -r1.5 QuestionnaireAction.java --- org/apache/jetspeed/modules/actions/portlets/QuestionnaireAction.java 24 Mar 2003 01:07:09 -0000 1.5 +++ org/apache/jetspeed/modules/actions/portlets/QuestionnaireAction.java 19 Jul 2003 21:47:16 -0000 @@ -55,7 +55,6 @@ package org.apache.jetspeed.modules.actions.portlets; // Turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Jetspeed stuff @@ -63,6 +62,8 @@ import org.apache.jetspeed.om.registry.Parameter; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.om.registry.PortletEntry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; // Java stuff @@ -94,6 +95,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(QuestionnaireAction.class.getName()); + + /** * Build the normal state content for this portlet. * * @param portlet The jsp-based portlet that is being built. @@ -244,7 +250,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); rundata.setMessage("Error sending email: " + e); } Index: org/apache/jetspeed/modules/actions/portlets/RegistryUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/RegistryUpdateAction.java,v retrieving revision 1.5 diff -u -r1.5 RegistryUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/RegistryUpdateAction.java 16 Jul 2003 15:14:29 -0000 1.5 +++ org/apache/jetspeed/modules/actions/portlets/RegistryUpdateAction.java 19 Jul 2003 21:47:18 -0000 @@ -72,10 +72,11 @@ import org.apache.jetspeed.om.registry.base.BaseSecurity; import org.apache.jetspeed.portal.portlets.VelocityPortlet; import org.apache.jetspeed.services.Registry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedLinkFactory; import org.apache.turbine.util.DynamicURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.TurbineException; import org.apache.turbine.util.security.EntityExistsException; @@ -99,6 +100,11 @@ private static final String REASON = "reason"; + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(RegistryUpdateAction.class.getName()); + protected void buildNormalContext( VelocityPortlet portlet, Context context, @@ -181,7 +187,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Trying to create duplicate entry"); } @@ -196,7 +202,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -231,7 +237,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry for updating"); } @@ -247,7 +253,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -274,7 +280,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry for deleting"); } @@ -295,7 +301,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -501,7 +507,7 @@ resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry while trying to add a parameter"); } @@ -517,7 +523,7 @@ resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -631,7 +637,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry while trying to update parameters"); } @@ -647,7 +653,7 @@ resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -728,7 +734,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry while trying to update parameters"); } @@ -743,7 +749,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -798,7 +804,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry while trying to remove parameters"); } @@ -813,7 +819,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -863,7 +869,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry while trying to add media type"); } @@ -878,7 +884,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -934,7 +940,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry while trying to remove media types"); } @@ -949,7 +955,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -1033,7 +1039,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry while trying to add capabilities"); } @@ -1048,7 +1054,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -1125,7 +1131,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error( + logger.error( this.getClass().getName() + ": Failed to find registry entry while trying to remove capabilities"); } @@ -1140,7 +1146,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } Index: org/apache/jetspeed/modules/actions/portlets/SecurityUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/SecurityUpdateAction.java,v retrieving revision 1.2 diff -u -r1.2 SecurityUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/SecurityUpdateAction.java 2 May 2003 19:23:48 -0000 1.2 +++ org/apache/jetspeed/modules/actions/portlets/SecurityUpdateAction.java 19 Jul 2003 21:47:18 -0000 @@ -65,10 +65,11 @@ import org.apache.jetspeed.om.registry.base.BaseSecurityAllowOwner; import org.apache.jetspeed.om.registry.base.BaseSecurityEntry; import org.apache.jetspeed.portal.portlets.VelocityPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.JetspeedSecurity; import org.apache.jetspeed.services.Registry; import org.apache.turbine.util.DynamicURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; @@ -81,6 +82,11 @@ { private static final String SECURITY_UPDATE_PANE = "security-form"; + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(SecurityUpdateAction.class.getName()); + public SecurityUpdateAction() { registryEntryName = "security_name"; @@ -209,7 +215,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to add accesses"); + logger.error("Failed to find registry entry while trying to add accesses"); } } catch (Exception e) @@ -218,7 +224,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -265,7 +271,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to update accesses"); + logger.error("Failed to find registry entry while trying to update accesses"); } } catch (Exception e) @@ -274,7 +280,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -317,7 +323,7 @@ } else { - Log.error( + logger.error( "Access Index: " + i + " is out of range"); } } @@ -346,7 +352,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to remove accesses"); + logger.error("Failed to find registry entry while trying to remove accesses"); } } catch (Exception e) @@ -355,7 +361,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -404,7 +410,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to add allow"); + logger.error("Failed to find registry entry while trying to add allow"); } } catch (Exception e) @@ -413,7 +419,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -482,7 +488,7 @@ } else { - Log.error( + logger.error( "Allow Index: " + allowIndex + " is out of range."); @@ -509,7 +515,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(this.getClass().getName() + ": Failed to find registry entry while trying to remove allow"); + logger.error("Failed to find registry entry while trying to remove allow"); } } catch (Exception e) @@ -518,7 +524,7 @@ rundata.setRedirectURI(duri.toString()); resetForm(rundata); - Log.error(e); + logger.error("Exception", e); } } @@ -572,9 +578,9 @@ } catch (Exception e) { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("SecurityUpdateAction: Failed to clear user data"); + logger.debug("SecurityUpdateAction: Failed to clear user data"); } } } Index: org/apache/jetspeed/modules/actions/portlets/SkinUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/SkinUpdateAction.java,v retrieving revision 1.4 diff -u -r1.4 SkinUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/SkinUpdateAction.java 2 May 2003 19:23:48 -0000 1.4 +++ org/apache/jetspeed/modules/actions/portlets/SkinUpdateAction.java 19 Jul 2003 21:47:19 -0000 @@ -61,8 +61,9 @@ import org.apache.jetspeed.om.registry.RegistryEntry; import org.apache.jetspeed.om.registry.SkinEntry; import org.apache.jetspeed.portal.portlets.VelocityPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.velocity.context.Context; @@ -78,6 +79,11 @@ private static final String PARAMETER = "parameter."; private static final String SKIN_UPDATE_PANE = "SkinForm"; + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(SkinUpdateAction.class.getName()); + public SkinUpdateAction() { registryEntryName = "skinname"; @@ -220,9 +226,9 @@ } catch (Exception e) { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("SkinUpdateAction: Failed to clear user data"); + logger.debug("SkinUpdateAction: Failed to clear user data"); } } } Index: org/apache/jetspeed/modules/actions/portlets/StockQuoteAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/StockQuoteAction.java,v retrieving revision 1.9 diff -u -r1.9 StockQuoteAction.java --- org/apache/jetspeed/modules/actions/portlets/StockQuoteAction.java 4 Mar 2003 00:04:53 -0000 1.9 +++ org/apache/jetspeed/modules/actions/portlets/StockQuoteAction.java 19 Jul 2003 21:47:19 -0000 @@ -55,9 +55,10 @@ package org.apache.jetspeed.modules.actions.portlets; import org.apache.jetspeed.portal.portlets.VelocityPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; // Turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.services.TurbineServices; // Velocity Stuff @@ -87,6 +88,11 @@ private static final String SELECTED_COLUMNS = "selected-columns"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(StockQuoteAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -155,7 +161,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); rundata.setMessage("Error in Jetspeed Stock Quotes: " + e.toString()); rundata.setStackTrace(org.apache.turbine.util.StringUtils.stackTrace(e), e); Index: org/apache/jetspeed/modules/actions/portlets/WeatherAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/WeatherAction.java,v retrieving revision 1.5 diff -u -r1.5 WeatherAction.java --- org/apache/jetspeed/modules/actions/portlets/WeatherAction.java 2 Jul 2003 22:34:45 -0000 1.5 +++ org/apache/jetspeed/modules/actions/portlets/WeatherAction.java 19 Jul 2003 21:47:19 -0000 @@ -1,7 +1,7 @@ /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2003 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -54,12 +54,10 @@ package org.apache.jetspeed.modules.actions.portlets; -// Jetspeed stuff +// Velocity stuff import org.apache.jetspeed.portal.portlets.VelocityPortlet; import org.apache.jetspeed.modules.actions.portlets.VelocityPortletAction; -import org.apache.jetspeed.util.PortletConfigState; -// Turbine stuff import org.apache.turbine.util.RunData; // Velocity Stuff @@ -71,27 +69,19 @@ /** * WeatherAction portlet uses WeatherUnderground's weather condition * stickers/banners to build the portlet view. - * + * *

Donated by Community Grids Java Source Package

*

Provides supporting classess for portal environments.

- * + * * @author Ozgur Balsoy - * @version $Id: WeatherAction.java,v 1.5 2003/07/02 22:34:45 morciuch Exp $ + * @version $Id: WeatherAction.java,v 1.4 2003/03/04 00:04:53 sgala Exp $ */ public class WeatherAction extends VelocityPortletAction { - public static final String WEATHER_CITY_INFO = "weather_city_info"; - public static final String WEATHER_STATE = "weather_state"; - public static final String WEATHER_CITY = "weather_city"; - public static final String WEATHER_STATION = "weather_station"; - public static final String WEATHER_STYLE = "weather_style"; - + /** * Nothing specific for maximized view. - * - * @param portlet - * @param context - * @param rundata + * * @see VelocityPortletAction#buildMaximizedContext */ protected void buildMaximizedContext( VelocityPortlet portlet, @@ -100,73 +90,112 @@ { buildNormalContext( portlet, context, rundata); } - + + /** + * Subclasses should override this method if they wish to + * provide their own customization behavior. + * Default is to use Portal base customizer action + * + * @see VelocityPortletAction#buildConfigureContext + */ + protected void buildConfigureContext( VelocityPortlet portlet, + Context context, + RunData rundata ) + { + buildNormalContext( portlet, context, rundata); + String cityInfo = (String)context.get("weather_city_info"); + if(cityInfo != null) + { + try + { + javax.naming.Name path = new javax.naming.CompositeName(cityInfo); + if(path.size()==3) + { + if(path.get(0).equals("US")) + { + context.put("weather_state",path.get(1)); + context.put("weather_city",path.get(2).replace('_',' ')); + } else + { + context.put("weather_station",path.get(2)); + } + } + } + catch(Exception ex) + {} + } + setTemplate(rundata, "weather-customize"); + } + /** * Subclasses must override this method to provide default behavior * for the portlet action - * - * @param portlet - * @param context - * @param rundata + * * @see VelocityPortletAction#buildNormalContext */ protected void buildNormalContext( VelocityPortlet portlet, Context context, RunData rundata ) { - - String cityInfo = PortletConfigState.getParameter(portlet, rundata, this.WEATHER_CITY_INFO, null); - //if (cityInfo == null) - //{ - String city = portlet.getPortletConfig().getInitParameter(this.WEATHER_CITY); - String state = portlet.getPortletConfig().getInitParameter(this.WEATHER_STATE); - String station = portlet.getPortletConfig().getInitParameter(this.WEATHER_STATION); - cityInfo = getCityInfo(city, state, station); - //} - context.put(this.WEATHER_CITY_INFO, cityInfo); - PortletConfigState.setInstanceParameter(portlet, rundata, this.WEATHER_CITY_INFO, cityInfo); - - String style = PortletConfigState.getParameter(portlet, rundata, this.WEATHER_STYLE, "infobox"); - context.put(this.WEATHER_STYLE,style); + String cityInfo = portlet.getAttribute("weather_city_info",null, rundata); + if( cityInfo == null) + { + String city = portlet.getPortletConfig().getInitParameter("weather_city"); + String state = portlet.getPortletConfig().getInitParameter("weather_state"); + String station = portlet.getPortletConfig().getInitParameter("weather_station"); + cityInfo = getCityInfo(city, state, station); + if(cityInfo == null) + { + setTemplate(rundata, "weather-customize"); + return; + } + else + { + portlet.setAttribute("weather_city_info",cityInfo, rundata); + } + } + context.put("weather_city_info", cityInfo); + String style = portlet.getAttribute("weather_style",null,rundata); + if(style == null) + { + style = portlet.getPortletConfig().getInitParameter("weather_style"); + if(style == null) + { + style = "infobox"; + portlet.setAttribute("weather_style",style,rundata); + } + } + context.put("weather_style",style); } - + /** * Builds the path for US cities. The format is US/ST/City.html, i.e. * for New York City, the city path is US/NY/New_York - * - * @param city - * @param state - * @return */ private String getUSInfo(String city, String state) { city = city.trim().toLowerCase()+" "; - if (city.indexOf(" ")>0) + if(city.indexOf(" ")>0) { String newCity = ""; StringTokenizer st = new StringTokenizer(city, " "); - while (st.hasMoreTokens()) + while(st.hasMoreTokens()) { String token = st.nextToken(); newCity = newCity + token.substring(0,1).toUpperCase() + - token.substring(1) + "_"; + token.substring(1) + "_"; } city = newCity.substring(0, newCity.length()-1); // remove last '_' } state = state.toUpperCase(); return "US/" + state + "/" + city; } - + /** * Builds the city path for US or other world cities. For world cities, * the city path is global/station/station_number, i.e. * for Istanbul, Turkey, it is global/stations/17060. The station numbers * need to be obtained from the Weather Underground's site. - * - * @param city - * @param state - * @param station - * @return */ private String getCityInfo(String city, String state, String station) { @@ -181,18 +210,43 @@ } return cityInfo; } - + /** - * - * @param data - * @param context * @see VelocityPortletAction#doCancel - */ + */ public void doCancel(RunData data, Context context) { VelocityPortlet portlet = (VelocityPortlet) context.get("portlet"); buildNormalContext(portlet, context, data); } - + + /** + * Update PSML parmaters to reflect the desired + * weather station, i.e. city + * + * @param data data + * @param context a context for web pages. + */ + public void doUpdate(RunData data, Context context) + { + String city = (String) data.getParameters().getString("weather_city"); + String state = (String) data.getParameters().getString("weather_state"); + String style = (String) data.getParameters().getString("weather_style"); + String station = (String) data.getParameters().getString("weather_station"); + + String cityInfo = getCityInfo(city, state, station); + if (cityInfo != null) + { + VelocityPortlet portlet = (VelocityPortlet) context.get("portlet"); + context.put("weather_city_info", cityInfo); + portlet.setAttribute("weather_city_info", cityInfo, data); + if (style == null || style.equals("")) + { + style = "infobox"; + } + context.put("weather_style", style); + portlet.setAttribute("weather_style", style, data); + } + } } Index: org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java,v retrieving revision 1.28 diff -u -r1.28 DatabaseBrowserAction.java --- org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java 17 Apr 2003 21:30:37 -0000 1.28 +++ org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java 19 Jul 2003 21:47:20 -0000 @@ -71,13 +71,14 @@ import java.util.StringTokenizer; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; import org.apache.torque.Torque; // jetspeed services +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; // jetspeed velocity @@ -135,6 +136,11 @@ protected List sqlParameters = new Vector(); /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(DatabaseBrowserAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -163,7 +169,7 @@ } catch (Exception ex) { - Log.error(ex); + logger.error("Exception", ex); } context.put(SQL, getQueryString(portlet, rundata, context)); context.put(WINDOW_SIZE, getParameterUsingFallback(portlet, rundata, WINDOW_SIZE, null)); @@ -205,7 +211,7 @@ } else { - Log.info("The sql query is null, hence not generating the result set."); + logger.info("The sql query is null, hence not generating the result set."); } } else @@ -249,7 +255,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); rundata.setMessage("Error in Jetspeed Database Browser: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); Index: org/apache/jetspeed/modules/actions/portlets/security/GroupBrowserAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/GroupBrowserAction.java,v retrieving revision 1.5 diff -u -r1.5 GroupBrowserAction.java --- org/apache/jetspeed/modules/actions/portlets/security/GroupBrowserAction.java 4 Mar 2003 00:04:54 -0000 1.5 +++ org/apache/jetspeed/modules/actions/portlets/security/GroupBrowserAction.java 19 Jul 2003 21:47:20 -0000 @@ -60,7 +60,6 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; @@ -69,6 +68,8 @@ import org.apache.jetspeed.services.JetspeedSecurity; // jetspeed services +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; // jetspeed velocity @@ -86,6 +87,11 @@ public class GroupBrowserAction extends VelocityPortletAction { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(GroupBrowserAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -134,7 +140,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); rundata.setMessage("Error in Jetspeed Group Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); Index: org/apache/jetspeed/modules/actions/portlets/security/GroupUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/GroupUpdateAction.java,v retrieving revision 1.7 diff -u -r1.7 GroupUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/security/GroupUpdateAction.java 4 Mar 2003 00:04:54 -0000 1.7 +++ org/apache/jetspeed/modules/actions/portlets/security/GroupUpdateAction.java 19 Jul 2003 21:47:20 -0000 @@ -58,7 +58,6 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; import org.apache.turbine.util.DynamicURI; @@ -70,6 +69,8 @@ import org.apache.jetspeed.om.security.JetspeedGroupFactory; // jetspeed services +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; // jetspeed velocity @@ -87,6 +88,11 @@ public class GroupUpdateAction extends VelocityPortletAction { private static final String TEMP_GROUP = "tempGroup"; + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(GroupUpdateAction.class.getName()); /** * Build the maximized state content for this portlet. (Same as normal state). @@ -169,7 +175,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Error in Jetspeed User Security", e); rundata.setMessage("Error in Jetspeed User Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -217,7 +223,7 @@ catch (GroupException e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -259,8 +265,8 @@ } catch (Exception e) { - // log the error msg - Log.error(e); + // Log the error msg + logger.error("Exception", e); // // error on update - display error message @@ -308,7 +314,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on delete - display error message Index: org/apache/jetspeed/modules/actions/portlets/security/PermissionBrowserAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/PermissionBrowserAction.java,v retrieving revision 1.5 diff -u -r1.5 PermissionBrowserAction.java --- org/apache/jetspeed/modules/actions/portlets/security/PermissionBrowserAction.java 4 Mar 2003 00:04:54 -0000 1.5 +++ org/apache/jetspeed/modules/actions/portlets/security/PermissionBrowserAction.java 19 Jul 2003 21:47:21 -0000 @@ -60,12 +60,13 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; // jetspeed services import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.security.JetspeedSecurityException; import org.apache.jetspeed.services.resources.JetspeedResources; @@ -83,6 +84,11 @@ public class PermissionBrowserAction extends VelocityPortletAction { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PermissionBrowserAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -131,7 +137,7 @@ catch (JetspeedSecurityException e) { // log the error msg - Log.error(e); + logger.error("Exception", e); rundata.setMessage("Error in Jetspeed Permission Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); Index: org/apache/jetspeed/modules/actions/portlets/security/PermissionUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/PermissionUpdateAction.java,v retrieving revision 1.6 diff -u -r1.6 PermissionUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/security/PermissionUpdateAction.java 4 Mar 2003 00:04:54 -0000 1.6 +++ org/apache/jetspeed/modules/actions/portlets/security/PermissionUpdateAction.java 19 Jul 2003 21:47:21 -0000 @@ -58,7 +58,6 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; import org.apache.turbine.util.DynamicURI; @@ -68,6 +67,8 @@ import org.apache.jetspeed.om.security.JetspeedPermissionFactory; // jetspeed services import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.security.JetspeedSecurityException; import org.apache.jetspeed.services.resources.JetspeedResources; @@ -87,6 +88,11 @@ private static final String TEMP_PERMISSION = "tempPermission"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PermissionUpdateAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -168,7 +174,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Error in Jetspeed User Security", e); rundata.setMessage("Error in Jetspeed User Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -216,7 +222,7 @@ catch (JetspeedSecurityException e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -259,7 +265,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on update - display error message @@ -306,7 +312,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on delete - display error message Index: org/apache/jetspeed/modules/actions/portlets/security/RoleBrowserAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RoleBrowserAction.java,v retrieving revision 1.7 diff -u -r1.7 RoleBrowserAction.java --- org/apache/jetspeed/modules/actions/portlets/security/RoleBrowserAction.java 4 Mar 2003 00:04:54 -0000 1.7 +++ org/apache/jetspeed/modules/actions/portlets/security/RoleBrowserAction.java 19 Jul 2003 21:47:21 -0000 @@ -60,12 +60,13 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; // jetspeed services import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; // jetspeed velocity @@ -81,6 +82,12 @@ */ public class RoleBrowserAction extends VelocityPortletAction { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(RoleBrowserAction.class.getName()); + /** * Build the maximized state content for this portlet. (Same as normal state). * @@ -130,7 +137,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Error in Jetspeed Role Security", e); rundata.setMessage("Error in Jetspeed Role Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); Index: org/apache/jetspeed/modules/actions/portlets/security/RolePermissionUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RolePermissionUpdateAction.java,v retrieving revision 1.6 diff -u -r1.6 RolePermissionUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/security/RolePermissionUpdateAction.java 4 Mar 2003 00:04:54 -0000 1.6 +++ org/apache/jetspeed/modules/actions/portlets/security/RolePermissionUpdateAction.java 19 Jul 2003 21:47:22 -0000 @@ -63,7 +63,6 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; import org.apache.turbine.util.DynamicURI; @@ -74,6 +73,8 @@ // jetspeed services import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.services.security.JetspeedSecurityException; // jetspeed velocity @@ -92,6 +93,11 @@ private static final String TEMP_ROLE = "tempRole"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(RolePermissionUpdateAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -165,7 +171,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Error in Jetspeed Role Permission Security", e); rundata.setMessage("Error in Jetspeed Role Permission Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -185,7 +191,7 @@ String entityid = rundata.getParameters().getString(SecurityConstants.PARAM_ENTITY_ID); if (entityid == null || entityid.trim().length() == 0) { - Log.error("RolePermissionBrowser: Failed to get entity: " + entityid ); + logger.error("RolePermissionBrowser: Failed to get entity: " + entityid ); DynamicURI duri = new DynamicURI (rundata); duri.addPathInfo(SecurityConstants.PANE_NAME, SecurityConstants.PANEID_ROLEPERMISSION_UPDATE); duri.addPathInfo(SecurityConstants.PARAM_MSGID, SecurityConstants.MID_MISSING_PARAMETER); @@ -195,7 +201,7 @@ Role role = JetspeedSecurity.getRole(entityid); if (null == role) { - Log.error("RolePermissionBrowser: Failed to get role: " + entityid ); + logger.error("RolePermissionBrowser: Failed to get role: " + entityid ); DynamicURI duri = new DynamicURI (rundata); duri.addPathInfo(SecurityConstants.PANE_NAME, SecurityConstants.PANEID_ROLEPERMISSION_UPDATE); duri.addPathInfo(SecurityConstants.PARAM_MSGID, SecurityConstants.MID_MISSING_PARAMETER); @@ -251,7 +257,7 @@ catch (Exception e) { // log the error msg - Log.error("Failed update role+permission: " + e); + logger.error("Failed update role+permission", e); // // error on update - display error message @@ -288,7 +294,7 @@ if (null == role) { // no ACL found - Log.error("RolePermissionBrowser: Failed to get role: " + roleName); + logger.error("RolePermissionBrowser: Failed to get role: " + roleName); return; } Index: org/apache/jetspeed/modules/actions/portlets/security/RoleUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/RoleUpdateAction.java,v retrieving revision 1.9 diff -u -r1.9 RoleUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/security/RoleUpdateAction.java 4 Mar 2003 00:04:54 -0000 1.9 +++ org/apache/jetspeed/modules/actions/portlets/security/RoleUpdateAction.java 19 Jul 2003 21:47:22 -0000 @@ -58,7 +58,6 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; import org.apache.turbine.util.DynamicURI; @@ -68,6 +67,8 @@ import org.apache.jetspeed.om.security.BaseJetspeedRole; // jetspeed services import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.security.RoleException; import org.apache.jetspeed.services.resources.JetspeedResources; @@ -87,6 +88,11 @@ private static final String TEMP_ROLE = "tempRole"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(RoleUpdateAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -167,7 +173,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Error in Jetspeed User Security", e); rundata.setMessage("Error in Jetspeed User Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -216,7 +222,7 @@ catch (RoleException e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -259,7 +265,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on update - display error message @@ -307,7 +313,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on delete - display error message Index: org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java,v retrieving revision 1.10 diff -u -r1.10 UserBrowserAction.java --- org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java 4 Mar 2003 00:04:54 -0000 1.10 +++ org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java 19 Jul 2003 21:47:22 -0000 @@ -59,12 +59,13 @@ import org.apache.velocity.app.FieldMethodizer; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; // jetspeed services import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.security.JetspeedSecurityException; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.om.security.JetspeedUser; @@ -111,6 +112,11 @@ public static final String FILTER_TYPE_LASTNAME = "filter_type_lastname"; /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(UserBrowserAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -179,7 +185,7 @@ } catch (org.apache.regexp.RESyntaxException rex) { - Log.warn("UserBrowserAction: error processing regular expression [" + filterValue + "]: " + + logger.warn("UserBrowserAction: error processing regular expression [" + filterValue + "]: " + rex.toString()); } } @@ -262,7 +268,7 @@ catch (JetspeedSecurityException e) { // log the error msg - Log.error(e); + logger.error("Exception", e); rundata.setMessage("Error in Jetspeed User Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); Index: org/apache/jetspeed/modules/actions/portlets/security/UserGroupUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserGroupUpdateAction.java,v retrieving revision 1.2 diff -u -r1.2 UserGroupUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/security/UserGroupUpdateAction.java 4 Mar 2003 00:04:54 -0000 1.2 +++ org/apache/jetspeed/modules/actions/portlets/security/UserGroupUpdateAction.java 19 Jul 2003 21:47:23 -0000 @@ -64,10 +64,11 @@ import org.apache.jetspeed.om.security.Group; import org.apache.jetspeed.om.security.JetspeedUser; import org.apache.jetspeed.portal.portlets.VelocityPortlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.JetspeedSecurity; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.turbine.util.DynamicURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; import org.apache.velocity.context.Context; @@ -83,6 +84,11 @@ public class UserGroupUpdateAction extends VelocityPortletAction { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(UserGroupUpdateAction.class.getName()); + + /** * Build the maximized state content for this portlet. (Same as normal state). * * @param portlet The velocity-based portlet that is being built. @@ -156,7 +162,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Error in Jetspeed User Group Security", e); rundata.setMessage("Error in Jetspeed User Group Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -176,7 +182,7 @@ String entityid = rundata.getParameters().getString(SecurityConstants.PARAM_ENTITY_ID); if (entityid == null || entityid.trim().length() == 0) { - Log.error("UserGroupBrowser: Failed to get entity: " + entityid ); + logger.error("UserGroupBrowser: Failed to get entity: " + entityid ); DynamicURI duri = new DynamicURI (rundata); duri.addPathInfo(SecurityConstants.PANE_NAME, "UserGroupForm"); duri.addPathInfo(SecurityConstants.PARAM_MSGID, SecurityConstants.MID_MISSING_PARAMETER); @@ -187,7 +193,7 @@ JetspeedUser user = JetspeedSecurity.getUser(entityid); if (null == user) { - Log.error("UserGroupBrowser: Failed to get user: " + entityid ); + logger.error("UserGroupBrowser: Failed to get user: " + entityid ); DynamicURI duri = new DynamicURI (rundata); duri.addPathInfo(SecurityConstants.PANE_NAME, "UserGroupForm"); duri.addPathInfo(SecurityConstants.PARAM_MSGID, SecurityConstants.MID_MISSING_PARAMETER); @@ -243,7 +249,7 @@ catch (Exception e) { // log the error msg - Log.error("Failed update role+permission: " + e); + logger.error("Failed update role+permission: ", e); // // error on update - display error message @@ -277,7 +283,7 @@ if (null == user) { // no User found - Log.error("UserGroupBrowser: Failed to get user: " + userid ); + logger.error("UserGroupBrowser: Failed to get user: " + userid ); return; } // get master list of roles Index: org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java,v retrieving revision 1.9 diff -u -r1.9 UserRoleUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java 9 Jun 2003 17:42:22 -0000 1.9 +++ org/apache/jetspeed/modules/actions/portlets/security/UserRoleUpdateAction.java 19 Jul 2003 21:47:23 -0000 @@ -63,7 +63,6 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; import org.apache.turbine.util.DynamicURI; @@ -79,6 +78,8 @@ import org.apache.jetspeed.om.profile.ProfileLocator; import org.apache.jetspeed.om.profile.Profile; import org.apache.jetspeed.om.profile.Portlets; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.PsmlManager; import org.apache.jetspeed.util.PortletUtils; import org.apache.jetspeed.services.rundata.JetspeedRunData; @@ -97,6 +98,12 @@ */ public class UserRoleUpdateAction extends VelocityPortletAction { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(UserRoleUpdateAction.class.getName()); + /** * Build the maximized state content for this portlet. (Same as normal state). * @@ -171,7 +178,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Error in Jetspeed User Role Security", e); rundata.setMessage("Error in Jetspeed User Role Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -191,7 +198,7 @@ String entityid = rundata.getParameters().getString(SecurityConstants.PARAM_ENTITY_ID); if (entityid == null || entityid.trim().length() == 0) { - Log.error("UserRoleBrowser: Failed to get entity: " + entityid ); + logger.error("UserRoleBrowser: Failed to get entity: " + entityid ); DynamicURI duri = new DynamicURI (rundata); duri.addPathInfo(SecurityConstants.PANE_NAME, SecurityConstants.PANEID_USERROLE_UPDATE); duri.addPathInfo(SecurityConstants.PARAM_MSGID, SecurityConstants.MID_MISSING_PARAMETER); @@ -202,7 +209,7 @@ JetspeedUser user = JetspeedSecurity.getUser(entityid); if (null == user) { - Log.error("UserRoleBrowser: Failed to get user: " + entityid ); + logger.error("UserRoleBrowser: Failed to get user: " + entityid ); DynamicURI duri = new DynamicURI (rundata); duri.addPathInfo(SecurityConstants.PANE_NAME, SecurityConstants.PANEID_USERROLE_UPDATE); duri.addPathInfo(SecurityConstants.PARAM_MSGID, SecurityConstants.MID_MISSING_PARAMETER); @@ -264,9 +271,8 @@ } catch (Exception e) { - // log the error msg - Log.error("Failed update role+permission: " + e); - Log.error(e); + // the error msg + logger.error("Failed update role+permission: ", e); // // error on update - display error message // @@ -298,9 +304,9 @@ Profile roleProfile = Profiler.getProfile(roleLocator); if (roleProfile != null) { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("UserRoleUpdateAction: retrieved profile for role: " + roleProfile.getPath()); + logger.debug("UserRoleUpdateAction: retrieved profile for role: " + roleProfile.getPath()); } } @@ -312,9 +318,9 @@ Profile userProfile = Profiler.getProfile(userLocator); if (userProfile != null) { - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("UserRoleUpdateAction: retrieved profile for user: " + userProfile.getPath()); + logger.debug("UserRoleUpdateAction: retrieved profile for user: " + userProfile.getPath()); } } @@ -336,9 +342,9 @@ Portlets pane = rolePortlets.getPortlets(i); pane.setLayout(null); userPortlets.addPortlets(pane); - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug("UserRoleUpdateAction: appended pane: " + pane.getId() + " to user: " + user.getUserName()); + logger.debug("UserRoleUpdateAction: appended pane: " + pane.getId() + " to user: " + user.getUserName()); } } } @@ -381,7 +387,7 @@ if (null == user) { // no User found - Log.error("UserRoleBrowser: Failed to get user: " + userid ); + logger.error("UserRoleBrowser: Failed to get user: " + userid ); return; } // get master list of roles Index: org/apache/jetspeed/modules/actions/portlets/security/UserUpdateAction.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserUpdateAction.java,v retrieving revision 1.14 diff -u -r1.14 UserUpdateAction.java --- org/apache/jetspeed/modules/actions/portlets/security/UserUpdateAction.java 4 Mar 2003 00:04:54 -0000 1.14 +++ org/apache/jetspeed/modules/actions/portlets/security/UserUpdateAction.java 19 Jul 2003 21:47:24 -0000 @@ -66,7 +66,6 @@ import org.apache.velocity.context.Context; // turbine util -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.util.StringUtils; import org.apache.turbine.util.DynamicURI; @@ -89,6 +88,8 @@ // jetspeed services import org.apache.jetspeed.services.TemplateLocator; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; // jetspeed security @@ -105,6 +106,12 @@ public class UserUpdateAction extends VelocityPortletAction { private static final String TEMP_USER = "tempUser"; + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(UserUpdateAction.class.getName()); + /** * Build the maximized state content for this portlet. (Same as normal state). * @@ -186,7 +193,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Error in Jetspeed User Security", e); rundata.setMessage("Error in Jetspeed User Security: " + e.toString()); rundata.setStackTrace(StringUtils.stackTrace(e), e); rundata.setScreenTemplate(JetspeedResources.getString("template.error","Error")); @@ -251,7 +258,7 @@ catch (NotUniqueUserException e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // dup key found - display error message - bring back to same screen @@ -331,7 +338,7 @@ } catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on update - display error message @@ -413,7 +420,7 @@ } catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on update - display error message @@ -502,7 +509,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on update - display error message @@ -563,7 +570,7 @@ catch (Exception e) { // log the error msg - Log.error(e); + logger.error("Exception", e); // // error on delete - display error message Index: org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java,v retrieving revision 1.19 diff -u -r1.19 JetspeedJspLayout.java --- org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java 7 May 2003 15:16:48 -0000 1.19 +++ org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java 19 Jul 2003 21:47:24 -0000 @@ -55,11 +55,12 @@ // Jetspeed imports import org.apache.jetspeed.services.TemplateLocator; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; //Turbine imports import org.apache.turbine.modules.Layout; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.jsp.JspService; import org.apache.turbine.services.jsp.TurbineJspService; @@ -78,6 +79,11 @@ */ public class JetspeedJspLayout extends Layout { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedJspLayout.class.getName()); + /** * Method called by LayoutLoader. * @@ -95,9 +101,9 @@ // set the content type (including charset) data.getResponse().setContentType(data.getContentType()); - if (Log.getLogger().isInfoEnabled() ) + if (logger.isInfoEnabled() ) { - Log.info("JetspeedJspLayout: set response content type to " + data.getContentType()); + logger.info("JetspeedJspLayout: set response content type to " + data.getContentType()); } // tell turbine that the response is handled by the JSP system. @@ -108,18 +114,18 @@ if (path != null) screenPath = jsp.getRelativeTemplateName("/screens" + path); data.getRequest().setAttribute("screenJsp", screenPath); - if (Log.getLogger().isInfoEnabled() ) + if (logger.isInfoEnabled() ) { - Log.info("JetspeedJspLayout: set 'screenJSP' to: " + screenPath ); + logger.info("JetspeedJspLayout: set 'screenJSP' to: " + screenPath ); } // Grab the layout template set in the JetspeedTemplatePage. String templateName = data.getLayoutTemplate(); // Finally, generate the layout template and output to the response - if (Log.getLogger().isInfoEnabled() ) + if (logger.isInfoEnabled() ) { - Log.info("JetspeedJspLayout: forward request to: " + "/layouts" + templateName); + logger.info("JetspeedJspLayout: forward request to: " + "/layouts" + templateName); } jsp.handleRequest(data, "/layouts" + templateName, false); } Index: org/apache/jetspeed/modules/layouts/JetspeedLayout.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/layouts/JetspeedLayout.java,v retrieving revision 1.11 diff -u -r1.11 JetspeedLayout.java --- org/apache/jetspeed/modules/layouts/JetspeedLayout.java 7 May 2003 15:16:48 -0000 1.11 +++ org/apache/jetspeed/modules/layouts/JetspeedLayout.java 19 Jul 2003 21:47:24 -0000 @@ -56,6 +56,8 @@ //jetspeed stuff import org.apache.jetspeed.capability.CapabilityMap; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.util.MimeType; @@ -65,7 +67,6 @@ import org.apache.turbine.modules.NavigationLoader; import org.apache.turbine.modules.ScreenLoader; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; // ECS Classes import org.apache.ecs.*; @@ -100,6 +101,14 @@ "\"http://www.wapforum.org/DTD/wml_1.1.xml\"" ); + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedLayout.class.getName()); + + /** + * + */ public void doBuild( RunData data ) throws Exception { @@ -109,9 +118,9 @@ data.setContentType( mt.getContentType() ); data.setCharSet( mt.getCharSet() ); - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug( "Layout: Setting type to: " + mt ); + logger.debug( "Layout: Setting type to: " + mt ); } if ( mt.equals( MimeType.WML ) ) { @@ -134,7 +143,7 @@ try { ec.output( data.getOut() ); } catch ( java.io.IOException e ) { - Log.error( e ); + logger.error("Exception", e); } finally { ec = null; } Index: org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java,v retrieving revision 1.22 diff -u -r1.22 JetspeedTemplatePage.java --- org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java 7 May 2003 15:16:48 -0000 1.22 +++ org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java 19 Jul 2003 21:47:25 -0000 @@ -58,13 +58,14 @@ import org.apache.turbine.modules.pages.DefaultPage; // Turbine Utility Classes -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.services.template.TurbineTemplate; // Jetspeed Classes import org.apache.jetspeed.util.MimeType; import org.apache.jetspeed.om.registry.MediaTypeEntry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.Registry; import org.apache.jetspeed.capability.CapabilityMap; import org.apache.jetspeed.services.TemplateLocator; @@ -127,6 +128,11 @@ private static int httpLifetime = JetspeedResources.getInt("http.lifetime", -1); /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedTemplatePage.class.getName()); + + /** * Works with TemplateService to set up default templates and * corresponding class modules. * @@ -167,9 +173,9 @@ } data.setCharSet( characterSet ); - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug( "JetspeedTemplatePage: Setting type to: " + cm.getPreferredType().getContentType() + logger.debug( "JetspeedTemplatePage: Setting type to: " + cm.getPreferredType().getContentType() + "; charset=" + JetspeedResources.getString(JetspeedResources.CONTENT_ENCODING_KEY,"utf-8") ); } @@ -213,9 +219,9 @@ { template=template+"."+ext; } - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug("JetspeedTemplatePage: requested template = " + template); + logger.debug("JetspeedTemplatePage: requested template = " + template); } // get real path now - this is a fix to get us thru 1.3a2 @@ -224,16 +230,16 @@ String locatedScreen = TemplateLocator.locateScreenTemplate(data, template); data.setScreenTemplate( locatedScreen ); - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug("JetspeedTemplatePage: calculated template = " + locatedScreen); + logger.debug("JetspeedTemplatePage: calculated template = " + locatedScreen); } String layout = TemplateLocator.locateLayoutTemplate(data, template); data.setLayoutTemplate(layout); - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug("JetspeedTemplatePage: layoutTemplate is finally " + layout); + logger.debug("JetspeedTemplatePage: layoutTemplate is finally " + layout); } String screen = TurbineTemplate.getScreenName(template); Index: org/apache/jetspeed/modules/parameters/JspParameterPresentationStyle.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters/JspParameterPresentationStyle.java,v retrieving revision 1.2 diff -u -r1.2 JspParameterPresentationStyle.java --- org/apache/jetspeed/modules/parameters/JspParameterPresentationStyle.java 21 Nov 2002 23:49:41 -0000 1.2 +++ org/apache/jetspeed/modules/parameters/JspParameterPresentationStyle.java 19 Jul 2003 21:47:25 -0000 @@ -55,7 +55,6 @@ package org.apache.jetspeed.modules.parameters; // Turbine support -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.services.TurbineServices; import org.apache.turbine.services.jsp.JspService; @@ -65,6 +64,8 @@ // jetspeed stuff import org.apache.jetspeed.services.TemplateLocator; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; /** * Generic jsp-based presentation style. The following default objects are put in the context: @@ -93,6 +94,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JspParameterPresentationStyle.class.getName()); + + /** * Returns presentation control * * @param data - rundata object @@ -134,7 +140,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); // Fallback to input text box presentation style result = "Creates an "LDAP-safe" ID from a String so that * the generated ID is as similar as possible to the * original value. For example, value "Ryhmä" ("group" @@ -201,7 +209,7 @@ } catch (Exception e) { - Log.warn("Could not parse date '" + value + "'"); + logger.warn("Could not parse date '" + value + "'"); if (initializeIfNotSet) return new Date(); else return null; } @@ -362,7 +370,7 @@ } catch (NamingException e) { - Log.warn( "getUtil(): " + e.getMessage(), e ); + logger.warn( "getUtil(): " + e.getMessage(), e ); return new String(""); } } @@ -406,7 +414,7 @@ } catch (NamingException e) { - Log.warn( "getUtil(): " + e.getMessage(), e ); + logger.warn( "getUtil(): " + e.getMessage(), e ); } } Index: org/apache/jetspeed/om/security/ldap/LDAPUser.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/ldap/LDAPUser.java,v retrieving revision 1.5 diff -u -r1.5 LDAPUser.java --- org/apache/jetspeed/om/security/ldap/LDAPUser.java 7 May 2003 15:16:49 -0000 1.5 +++ org/apache/jetspeed/om/security/ldap/LDAPUser.java 19 Jul 2003 21:47:31 -0000 @@ -66,16 +66,19 @@ import javax.naming.directory.BasicAttributes; import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; + import org.apache.jetspeed.om.security.JetspeedUser; import org.apache.jetspeed.services.JetspeedAuthentication; import org.apache.jetspeed.services.JetspeedLDAP; import org.apache.jetspeed.services.JetspeedUserManagement; import org.apache.jetspeed.services.ldap.LDAPURL; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; import org.apache.jetspeed.services.security.JetspeedSecurityException; import org.apache.jetspeed.services.security.UserException; + import org.apache.turbine.om.security.User; -import org.apache.turbine.util.Log; import org.apache.turbine.util.ObjectUtils; /** @@ -86,8 +89,14 @@ * @version $Id: LDAPUser.java,v 1.5 2003/05/07 15:16:49 morciuch Exp $ * */ -public class LDAPUser extends BaseLDAPObject implements JetspeedUser, HttpSessionBindingListener { +public class LDAPUser extends BaseLDAPObject implements JetspeedUser, HttpSessionBindingListener +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(LDAPUser.class.getName()); + // ---------------------------- Constants ---------------------------- protected static final String OBJECT_CLASS = "jetspeeduser"; @@ -202,7 +211,7 @@ } catch (Exception e) { - Log.error("fillobject()" , e); + logger.error("fillobject()" , e); } setUserName(getutil(ATTR_UID, attributes)); @@ -226,7 +235,7 @@ } catch (Exception e) { - Log.error("fillobject() could not set password" , e); + logger.error("fillobject() could not set password" , e); } this.groupRoles = getutil( ATTR_USER_GROUP_ROLE, attributes, true ); @@ -260,7 +269,7 @@ } catch (Exception e) { - Log.warn("Could not serialize object data!" , e); + logger.warn("Could not serialize object data!" , e); } if (create) @@ -332,7 +341,7 @@ } catch (Exception e) { - Log.error("getUserId():" , e); + logger.error("getUserId():" , e); } return tmp; } @@ -358,7 +367,7 @@ } catch (Exception e) { - Log.error("getAccessCounterForSession():" , e); + logger.error("getAccessCounterForSession():" , e); return 0; } } @@ -376,7 +385,7 @@ } catch (Exception e) { - Log.error("getAccessCounter():" , e); + logger.error("getAccessCounter():" , e); return 0; } @@ -458,7 +467,7 @@ } catch (Exception e) { - Log.error("getPerm():" , e); + logger.error("getPerm():" , e); return def; } } @@ -510,7 +519,7 @@ } catch (Exception e) { - Log.error("getTemp():" , e); + logger.error("getTemp():" , e); val = def; } return val; @@ -536,7 +545,7 @@ } catch (Exception e) { - Log.error("getUserName():" , e); + logger.error("getUserName():" , e); } return tmp; @@ -562,7 +571,7 @@ } catch (Exception e) { - Log.error("getFirstName():" , e); + logger.error("getFirstName():" , e); } return tmp; } @@ -584,7 +593,7 @@ } catch (Exception e) { - Log.error("getLastName():" , e); + logger.error("getLastName():" , e); } return tmp; @@ -916,7 +925,7 @@ } catch ( Exception e ) { - Log.error("LDAPUser.valueUnbound(): " + e.getMessage(), e); + logger.error("LDAPUser.valueUnbound(): " + e.getMessage(), e); // To prevent messages being lost in case the logging system // goes away before sessions get unbound on servlet container @@ -964,7 +973,7 @@ } catch (Exception e) { - Log.error("getDisabled():" , e); + logger.error("getDisabled():" , e); } return disabled; Index: org/apache/jetspeed/portal/BasePortletSet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java,v retrieving revision 1.32 diff -u -r1.32 BasePortletSet.java --- org/apache/jetspeed/portal/BasePortletSet.java 9 Jul 2003 16:23:43 -0000 1.32 +++ org/apache/jetspeed/portal/BasePortletSet.java 19 Jul 2003 21:47:32 -0000 @@ -60,6 +60,8 @@ // Jetspeed stuff import org.apache.jetspeed.om.security.JetspeedUser; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.persistence.PersistenceManager; import org.apache.jetspeed.services.persistence.PortalPersistenceException; import org.apache.jetspeed.services.rundata.JetspeedRunData; @@ -72,7 +74,6 @@ // turbine stuff import org.apache.turbine.services.localization.Localization; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // ECS stuff @@ -94,6 +95,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(BasePortletSet.class.getName()); + + /** Is this set sorted */ private boolean dirty = false; @@ -145,7 +151,7 @@ } catch (PortletException e) { - Log.error(e); + logger.error("Exception", e); } } @@ -345,16 +351,16 @@ } catch (Exception e) { - Log.warn(e.toString()); + logger.warn(e.toString(), e); portalResource.setOwner(null); } if (!JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(), portalResource, JetspeedSecurity.PERMISSION_VIEW)) { - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug("Unauthorized access by user \"" + rundata.getUser().getUserName() + "\""); + logger.debug("Unauthorized access by user \"" + rundata.getUser().getUserName() + "\""); } // Clear any portlets that exist in this set if (this.portlets != null) @@ -365,9 +371,9 @@ } else { - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug("User \"" + rundata.getUser().getUserName() + "\" is authorized to portlet set " + getID()); + logger.debug("User \"" + rundata.getUser().getUserName() + "\" is authorized to portlet set " + getID()); } } @@ -718,7 +724,7 @@ } catch (Exception e) { - Log.warn(e.toString()); + logger.warn(e.toString(), e); portalResource.setOwner(null); } JetspeedRunData jdata = (JetspeedRunData) rundata; @@ -808,7 +814,7 @@ } catch (PortalPersistenceException e) { - Log.error("Exception while setting attribute " + attrName + " for portlet " + getName(), e); + logger.error("Exception while setting attribute " + attrName + " for portlet " + getName(), e); } } Index: org/apache/jetspeed/portal/JetspeedPortletInstance.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/JetspeedPortletInstance.java,v retrieving revision 1.7 diff -u -r1.7 JetspeedPortletInstance.java --- org/apache/jetspeed/portal/JetspeedPortletInstance.java 4 Mar 2003 00:05:03 -0000 1.7 +++ org/apache/jetspeed/portal/JetspeedPortletInstance.java 19 Jul 2003 21:47:32 -0000 @@ -57,7 +57,6 @@ import java.util.ArrayList; import java.util.Iterator; -import org.apache.turbine.util.Log; // ECS imports import org.apache.ecs.ConcreteElement; @@ -70,6 +69,8 @@ import org.apache.jetspeed.om.profile.Profile; import org.apache.jetspeed.om.profile.psml.PsmlParameter; import org.apache.jetspeed.portal.Portlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; //Turbine imports @@ -93,6 +94,11 @@ */ public class JetspeedPortletInstance implements PortletInstance { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedPortletInstance.class.getName()); + /** The Profile (and PSMLDocument) that we started with, considered RO */ private Profile m_profile = null; @@ -424,7 +430,7 @@ } catch (CloneNotSupportedException e) { - Log.warn("JetspeedPortletInstance: cannot clone Profile!: " + e); + logger.warn("JetspeedPortletInstance: cannot clone Profile!: " + e); } } } Index: org/apache/jetspeed/portal/controllers/AbstractPortletController.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/AbstractPortletController.java,v retrieving revision 1.24 diff -u -r1.24 AbstractPortletController.java --- org/apache/jetspeed/portal/controllers/AbstractPortletController.java 7 May 2003 15:16:49 -0000 1.24 +++ org/apache/jetspeed/portal/controllers/AbstractPortletController.java 19 Jul 2003 21:47:33 -0000 @@ -64,12 +64,13 @@ import org.apache.jetspeed.capability.CapabilityMap; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.services.Registry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.om.registry.PortletControllerEntry; import org.apache.jetspeed.om.registry.MediaTypeEntry; import org.apache.jetspeed.util.MimeType; //turbine support -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; //ecs stuff @@ -87,6 +88,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(AbstractPortletController.class.getName()); + + /** * Default padding to be displayed between portlets */ public int DEFAULT_PADDING = 3; @@ -150,7 +156,7 @@ PortletConfig conf = getPortlets().getPortletConfig(); padding = Integer.parseInt( conf.getSkin( "padding" , String.valueOf( DEFAULT_PADDING ) ) ); } catch ( RuntimeException e ) { - Log.error("Exception getting padding value", e); + logger.error("Exception getting padding value", e); padding = DEFAULT_PADDING; } @@ -165,7 +171,7 @@ PortletConfig conf = getPortlets().getPortletConfig(); conf.setSkin( "padding" , String.valueOf( padding ) ); } catch ( RuntimeException e ) { - Log.error("Exception setting padding value", e); + logger.error("Exception setting padding value", e); // FIXME: What should we do if there's no portlets, config or skin defined ? } @@ -179,7 +185,7 @@ PortletConfig conf = getPortlets().getPortletConfig(); conf.setSkin( "padding" , padding ); } catch ( RuntimeException e ) { - Log.error("Exception setting padding value", e); + logger.error("Exception setting padding value", e); // FIXME: What should we do if there's no portlets, config or skin defined ? } } Index: org/apache/jetspeed/portal/controllers/GridPortletController.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/GridPortletController.java,v retrieving revision 1.15 diff -u -r1.15 GridPortletController.java --- org/apache/jetspeed/portal/controllers/GridPortletController.java 7 May 2003 15:16:49 -0000 1.15 +++ org/apache/jetspeed/portal/controllers/GridPortletController.java 19 Jul 2003 21:47:33 -0000 @@ -55,17 +55,23 @@ package org.apache.jetspeed.portal.controllers; //ECS stuff -import org.apache.ecs.html.*; -import org.apache.ecs.*; +import org.apache.ecs.html.Table; +import org.apache.ecs.html.TD; +import org.apache.ecs.html.TR; + +import org.apache.ecs.ConcreteElement; +import org.apache.ecs.ElementContainer; //turbine RunData import org.apache.turbine.util.RunData; //jetspeed stuff -import org.apache.jetspeed.portal.*; - -// Turbine stuff -import org.apache.turbine.util.Log; +import org.apache.jetspeed.portal.Portlet; +import org.apache.jetspeed.portal.PortletConfig; +import org.apache.jetspeed.portal.PortletControllerConfig; +import org.apache.jetspeed.portal.PortletSet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; //standard Java stuff import java.util.Vector; @@ -100,8 +106,15 @@ @author Raphaël Luta @version $Id: GridPortletController.java,v 1.15 2003/05/07 15:16:49 morciuch Exp $ */ -public class GridPortletController extends AbstractPortletController { +public class GridPortletController extends AbstractPortletController +{ + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(GridPortletController.class.getName()); + private int columns = 0; private int rows = 0; private Vector rowHeights = null; @@ -233,7 +246,7 @@ } catch (Exception e) { - Log.error("getContent():", e); + logger.error("getContent():", e); } return base; Index: org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java,v retrieving revision 1.10 diff -u -r1.10 VelocityPanedPortletController.java --- org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java 23 Jun 2003 20:12:24 -0000 1.10 +++ org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java 19 Jul 2003 21:47:34 -0000 @@ -56,7 +56,6 @@ // Turbine stuff import org.apache.turbine.util.DynamicURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Jetspeed stuff @@ -64,6 +63,8 @@ import org.apache.jetspeed.portal.PanedPortletController; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedLinkFactory; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.statemanager.SessionState; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.services.resources.JetspeedResources; @@ -82,6 +83,12 @@ public class VelocityPanedPortletController extends VelocityPortletController implements PanedPortletController { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(VelocityPanedPortletController.class.getName()); + public static final String DEFAULT_PARAMETER = "pane"; /* @@ -213,7 +220,7 @@ } catch( Exception e) { - Log.error( e ); + logger.error("Exception", e); } DynamicURI uri = jsLink.getPaneById(portlet.getID()); JetspeedLinkFactory.putInstance(jsLink); Index: org/apache/jetspeed/portal/controllers/VelocityPortletController.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPortletController.java,v retrieving revision 1.10 diff -u -r1.10 VelocityPortletController.java --- org/apache/jetspeed/portal/controllers/VelocityPortletController.java 7 May 2003 15:16:49 -0000 1.10 +++ org/apache/jetspeed/portal/controllers/VelocityPortletController.java 19 Jul 2003 21:47:34 -0000 @@ -58,11 +58,12 @@ import org.apache.turbine.modules.ActionLoader; import org.apache.turbine.services.velocity.TurbineVelocity; import org.apache.turbine.services.pull.TurbinePull; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Jetspeed stuff import org.apache.jetspeed.services.TemplateLocator; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; // Ecs stuff import org.apache.ecs.ConcreteElement; @@ -81,6 +82,12 @@ */ public class VelocityPortletController extends AbstractPortletController { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(VelocityPortletController.class.getName()); + public ConcreteElement getContent( RunData rundata ) { // create a blank context and with all the global application @@ -114,7 +121,7 @@ } catch( Exception e) { - Log.error( e ); + logger.error("Exception", e); } } @@ -137,7 +144,7 @@ } catch( Exception e) { - Log.error( "Error generating content: ", e ); + logger.error( "Error generating content: ", e ); s= e.toString(); } Index: org/apache/jetspeed/portal/controls/TitleControl.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/TitleControl.java,v retrieving revision 1.12 diff -u -r1.12 TitleControl.java --- org/apache/jetspeed/portal/controls/TitleControl.java 7 May 2003 15:16:50 -0000 1.12 +++ org/apache/jetspeed/portal/controls/TitleControl.java 19 Jul 2003 21:47:34 -0000 @@ -71,11 +71,12 @@ import org.apache.jetspeed.util.URILookup; import org.apache.jetspeed.capability.CapabilityMap; import org.apache.jetspeed.capability.CapabilityMapFactory; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; //turbine import org.apache.turbine.util.ContentURI; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; //java imports @@ -96,7 +97,12 @@ public class TitleControl extends AbstractPortletControl { /** - Method checks, which MimeTyp is requested. According to this MimeTyp, the + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(TitleControl.class.getName()); + + /** + Method checks, which MimeType is requested. According to this MimeTyp, the appropriate method is invoked (getWMLContent() or getHTMLContent() ). @param rundata RunData object from Turbine. @return ConcreteElement object, including the complete ECS code for rendering @@ -110,7 +116,7 @@ if ( cm.getPreferredType().equals( MimeType.WML ) ) { return getWMLContent( rundata ); } - Log.error("The Given MIME-Type is not supportet for this control"); + logger.error("The Given MIME-Type is not supportet for this control"); return null; } @@ -192,7 +198,7 @@ .addElement( getTitle() ) ) ); } catch (JetspeedException e) { - Log.error(e); + logger.error("Exception", e); } return ec; } @@ -239,7 +245,7 @@ rundata); } catch (JetspeedException e) { - Log.error(e); + logger.error("Exception", e); } if ( type != URILookup.TYPE_EDIT_ACCOUNT) { @@ -260,7 +266,7 @@ v.addElement( edit ); } catch (JetspeedException e) { - Log.error(e); + logger.error("Exception", e); } } } @@ -283,7 +289,7 @@ } } catch (JetspeedException e) { - Log.error(e); + logger.error("Exception", e); } } } Index: org/apache/jetspeed/portal/controls/VelocityPortletControl.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java,v retrieving revision 1.24 diff -u -r1.24 VelocityPortletControl.java --- org/apache/jetspeed/portal/controls/VelocityPortletControl.java 7 May 2003 15:16:50 -0000 1.24 +++ org/apache/jetspeed/portal/controls/VelocityPortletControl.java 19 Jul 2003 21:47:35 -0000 @@ -57,13 +57,14 @@ // Turbine stuff import org.apache.turbine.services.velocity.TurbineVelocity; import org.apache.turbine.services.pull.TurbinePull; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Jetspeed stuff import org.apache.jetspeed.portal.Portlet; import org.apache.jetspeed.portal.PortletState; import org.apache.jetspeed.services.TemplateLocator; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.persistence.PersistenceManager; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.util.template.JetspeedTool; @@ -113,6 +114,11 @@ public class VelocityPortletControl extends AbstractPortletControl { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(VelocityPortletControl.class.getName()); + /** Disable content caching */ public boolean isCacheable() { @@ -171,7 +177,7 @@ } catch( Exception e ) { - Log.error( "Exception while creating content ", e ); + logger.error( "Exception while creating content ", e ); s = e.toString(); } @@ -305,7 +311,7 @@ } catch( Exception e) { - Log.error( "Exception in buildActionList", e ); + logger.error( "Exception in buildActionList", e ); } // action.setLink( jsLink.setPortletById(portlet.getID()) // .addQueryData("action", getAction( action.getName())) Index: org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java,v retrieving revision 1.13 diff -u -r1.13 VelocityPortletSetControl.java --- org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java 7 May 2003 15:16:50 -0000 1.13 +++ org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java 19 Jul 2003 21:47:35 -0000 @@ -55,7 +55,6 @@ package org.apache.jetspeed.portal.controls; // Turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; // Jetspeed stuff @@ -65,6 +64,8 @@ import org.apache.jetspeed.portal.PortletState; import org.apache.jetspeed.portal.PanedPortletController; import org.apache.jetspeed.services.JetspeedSecurity; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.services.security.PortalResource; import org.apache.jetspeed.util.template.JetspeedLink; @@ -95,6 +96,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(VelocityPortletSetControl.class.getName()); + + /** * This method adds the control specific objects to the context * * @param rundata the RunData object for this request @@ -145,7 +151,7 @@ } catch (Exception e) { - Log.warn(e.toString()); + logger.warn(e.toString(), e); portalResource.setOwner(null); } JetspeedRunData jdata = (JetspeedRunData) rundata; @@ -299,7 +305,7 @@ } catch (ClassCastException e) { - Log.error( "Exception in compare", e ); + logger.error( "Exception in compare", e ); return 0; } } Index: org/apache/jetspeed/portal/expire/ExpireFactory.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/ExpireFactory.java,v retrieving revision 1.4 diff -u -r1.4 ExpireFactory.java --- org/apache/jetspeed/portal/expire/ExpireFactory.java 7 May 2003 15:16:50 -0000 1.4 +++ org/apache/jetspeed/portal/expire/ExpireFactory.java 19 Jul 2003 21:47:35 -0000 @@ -56,18 +56,23 @@ //jetspeed stuff import org.apache.jetspeed.portal.Portlet; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.JetspeedException; -//turbine stuff -import org.apache.turbine.util.Log; - /** Handles content expiration @author Kevin A. Burton @version $Id: ExpireFactory.java,v 1.4 2003/05/07 15:16:50 morciuch Exp $ */ -public class ExpireFactory { +public class ExpireFactory +{ + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ExpireFactory.class.getName()); public static final String FILE_WATCH_EXPIRE = "org.apache.jetspeed.portal.expire.FileWatchExpire"; @@ -104,7 +109,7 @@ return expire; } catch ( Throwable t ) { - Log.error( t ); + logger.error("Throwable", t ); throw new JetspeedException( t.getMessage() ); } } Index: org/apache/jetspeed/portal/expire/FileWatchExpire.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/FileWatchExpire.java,v retrieving revision 1.8 diff -u -r1.8 FileWatchExpire.java --- org/apache/jetspeed/portal/expire/FileWatchExpire.java 7 May 2003 15:16:50 -0000 1.8 +++ org/apache/jetspeed/portal/expire/FileWatchExpire.java 19 Jul 2003 21:47:35 -0000 @@ -54,19 +54,26 @@ package org.apache.jetspeed.portal.expire; -//turbine stuff -import org.apache.turbine.util.Log; - //java stuff import java.io.IOException; +// Jetspeed classes +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; + /** Handles expiration mechanisms that expire when the file changes. @author Kevin A. Burton @version $Id: FileWatchExpire.java,v 1.8 2003/05/07 15:16:50 morciuch Exp $ */ -public class FileWatchExpire extends BaseExpire { +public class FileWatchExpire extends BaseExpire +{ + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(FileWatchExpire.class.getName()); FileWatcher fw = null; @@ -95,7 +102,7 @@ try { this.fw = new FileWatcher( url, this.getPortlet().getName() ); } catch ( IOException e ) { - Log.error( e ); + logger.error("Exception", e); } } Index: org/apache/jetspeed/portal/expire/FileWatcher.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/FileWatcher.java,v retrieving revision 1.14 diff -u -r1.14 FileWatcher.java --- org/apache/jetspeed/portal/expire/FileWatcher.java 7 May 2003 15:16:50 -0000 1.14 +++ org/apache/jetspeed/portal/expire/FileWatcher.java 19 Jul 2003 21:47:36 -0000 @@ -58,9 +58,8 @@ import org.apache.jetspeed.cache.disk.DiskCacheEntry; import org.apache.jetspeed.cache.disk.DiskCacheUtils; import org.apache.jetspeed.cache.disk.JetspeedDiskCache; - -//turbine stuff -import org.apache.turbine.util.Log; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; //java stuff import java.io.IOException; @@ -73,8 +72,14 @@ @author Kevin A. Burton @version $Id: FileWatcher.java,v 1.14 2003/05/07 15:16:50 morciuch Exp $ */ -public class FileWatcher implements Serializable{ +public class FileWatcher implements Serializable +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(FileWatcher.class.getName()); + //BEGIN Exception index public static final String EXCEPTION_URL_NOT_NULL = @@ -138,7 +143,7 @@ getLastModified(); } catch (Throwable e) { - Log.error( "Unable to set last modified on url " + url, e ); + logger.error( "Unable to set last modified on url " + url, e ); } this.url = url; @@ -175,7 +180,7 @@ if ( recent == 0 || this.lastModified < recent ) { - if ( Log.getLogger().isInfoEnabled() ) + if ( logger.isInfoEnabled() ) { String message = ""; @@ -185,13 +190,13 @@ message += "REFRESH: Expiring Portlet because it's URL has been modified on disk -> " + url; - Log.info( message ); + logger.info( message ); } return true; } } catch ( IOException e ) { - Log.error( e ); + logger.error("Exception", e ); return false; } Index: org/apache/jetspeed/portal/portlets/AbstractPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AbstractPortlet.java,v retrieving revision 1.62 diff -u -r1.62 AbstractPortlet.java --- org/apache/jetspeed/portal/portlets/AbstractPortlet.java 7 May 2003 15:16:50 -0000 1.62 +++ org/apache/jetspeed/portal/portlets/AbstractPortlet.java 19 Jul 2003 21:47:37 -0000 @@ -71,6 +71,8 @@ import org.apache.jetspeed.portal.PortletInstance; import org.apache.jetspeed.services.portletcache.Cacheable; import org.apache.jetspeed.services.Registry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.JetspeedException; import org.apache.jetspeed.util.MetaData; import org.apache.jetspeed.util.MimeType; @@ -82,7 +84,6 @@ //turbine stuff import org.apache.turbine.services.cache.CachedObject; import org.apache.turbine.services.cache.Refreshable; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; //java stuff @@ -111,6 +112,11 @@ public abstract class AbstractPortlet implements Portlet, PortletState, Cacheable, Refreshable { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(AbstractPortlet.class.getName()); + private boolean cacheable = true; private PortletConfig pc = null; @@ -203,7 +209,7 @@ * expected the any portlet type that is refreshable will * implement this method. */ - Log.debug( "AbstractPortlet - Refreshing " + this.getName() ); + logger.debug( "AbstractPortlet - Refreshing " + this.getName() ); } /* @@ -241,7 +247,7 @@ try { return ExpireFactory.getExpire( this, ExpireFactory.NO_EXPIRE ); } catch ( JetspeedException e ) { - Log.error( e ); + logger.error("Exception", e); return null; } } @@ -448,8 +454,8 @@ } } catch (Exception e) { element = new JetspeedClearElement("Error when retrieving Portlet contents"); - if( Log.getLogger().isDebugEnabled() ) { - Log.debug( "Error when retrieving Portlet contents", e ); + if( logger.isDebugEnabled() ) { + logger.debug( "Error when retrieving Portlet contents", e ); } } } else { @@ -850,7 +856,7 @@ } catch (PortalPersistenceException e) { - Log.error("Exception while setting attribute "+attrName+" for portlet "+getName(), e); + logger.error("Exception while setting attribute "+attrName+" for portlet "+getName(), e); } } Index: org/apache/jetspeed/portal/portlets/AggregatePortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AggregatePortlet.java,v retrieving revision 1.6 diff -u -r1.6 AggregatePortlet.java --- org/apache/jetspeed/portal/portlets/AggregatePortlet.java 4 Mar 2003 00:05:04 -0000 1.6 +++ org/apache/jetspeed/portal/portlets/AggregatePortlet.java 19 Jul 2003 21:47:37 -0000 @@ -62,12 +62,13 @@ import org.apache.jetspeed.services.PortalToolkit; import org.apache.jetspeed.portal.PortletSet; import org.apache.jetspeed.services.rundata.JetspeedRunData; - +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.JetspeedClearElement; + import org.apache.ecs.ConcreteElement; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; /** Aggregate Portlet aggregates the content of other portlets. @@ -81,7 +82,11 @@ public class AggregatePortlet extends AbstractPortlet { - + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(AggregatePortlet.class.getName()); + /** Returns an HTML representation of this portlet. Usually a Portlet would initialized itself within init() and then when getContent is called it @@ -121,7 +126,7 @@ } catch (Exception e) { - Log.error( e ); + logger.error("Exception", e); return new JetspeedClearElement("Error in aggregation portlet: " + e.toString()); } } Index: org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java,v retrieving revision 1.37 diff -u -r1.37 ApplicationsPortlet.java --- org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java 7 May 2003 15:16:50 -0000 1.37 +++ org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java 19 Jul 2003 21:47:37 -0000 @@ -68,10 +68,11 @@ import org.apache.jetspeed.portal.PortletURIManager; import org.apache.jetspeed.services.PortletFactory; import org.apache.jetspeed.services.Registry; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.om.registry.PortletEntry; //turbine -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; //standard java stuff @@ -84,8 +85,14 @@ * @author Santiago Gala * @version $Id: ApplicationsPortlet.java,v 1.37 2003/05/07 15:16:50 morciuch Exp $ */ -public class ApplicationsPortlet extends AbstractPortlet { +public class ApplicationsPortlet extends AbstractPortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ApplicationsPortlet.class.getName()); + /* SGP: here we cache Applications */ private Vector applications = new Vector(); @@ -99,7 +106,7 @@ this.setTitle( "Applications" ); this.setDescription( "A list of Applications that are installed within Jetspeed" ); - Log.info( "Jetspeed: initializing the ApplicationsPortlet: BEGIN " ); + logger.info( "Jetspeed: initializing the ApplicationsPortlet: BEGIN " ); Enumeration portlets = Registry.get( Registry.PORTLET ).getEntries(); @@ -113,7 +120,7 @@ } } - Log.info( "Jetspeed: initializing the ApplicationsPortlet: END " ); + logger.info( "Jetspeed: initializing the ApplicationsPortlet: END " ); } Index: org/apache/jetspeed/portal/portlets/BASICAuthIFramePortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/BASICAuthIFramePortlet.java,v retrieving revision 1.1 diff -u -r1.1 BASICAuthIFramePortlet.java --- org/apache/jetspeed/portal/portlets/BASICAuthIFramePortlet.java 11 Jun 2003 21:47:47 -0000 1.1 +++ org/apache/jetspeed/portal/portlets/BASICAuthIFramePortlet.java 19 Jul 2003 21:47:37 -0000 @@ -55,6 +55,9 @@ package org.apache.jetspeed.portal.portlets; import org.apache.jetspeed.portal.PortletException; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; + import org.apache.turbine.util.RunData; import org.apache.ecs.ConcreteElement; @@ -70,6 +73,11 @@ public class BASICAuthIFramePortlet extends IFramePortlet { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(BASICAuthIFramePortlet.class.getName()); + private String origSource = null; private static final String USERNAME = "username"; @@ -89,7 +97,7 @@ } catch (PortletException pe) { - org.apache.turbine.util.Log.error(pe); + logger.error("Exception", pe); } } Index: org/apache/jetspeed/portal/portlets/ContainerTestPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ContainerTestPortlet.java,v retrieving revision 1.6 diff -u -r1.6 ContainerTestPortlet.java --- org/apache/jetspeed/portal/portlets/ContainerTestPortlet.java 4 Mar 2003 00:05:04 -0000 1.6 +++ org/apache/jetspeed/portal/portlets/ContainerTestPortlet.java 19 Jul 2003 21:47:37 -0000 @@ -62,8 +62,9 @@ import org.apache.jetspeed.om.profile.Profile; import org.apache.jetspeed.om.profile.PSMLDocument; import org.apache.jetspeed.om.profile.Portlets; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; - import org.apache.jetspeed.services.persistence.PersistenceManager; import org.apache.jetspeed.services.persistence.PortalPersistenceException; import org.apache.jetspeed.portal.PortletInstance; @@ -74,7 +75,6 @@ import org.apache.ecs.ConcreteElement; import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; /** Aggregate Portlet aggregates the content of other portlets. @@ -89,6 +89,12 @@ public class ContainerTestPortlet implements Portlet /* , PortletState, Cacheable, Refreshable */ { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ContainerTestPortlet.class.getName()); + private String image = null; private String name = "not set"; @@ -288,7 +294,7 @@ } catch (Exception e) { - Log.error( e ); + logger.error("Exception", e); return new JetspeedClearElement("Error in aggregation portlet: " + e.toString()); } } @@ -406,7 +412,7 @@ } catch (PortalPersistenceException e) { - Log.error("Exception while setting attribute "+attrName+" for portlet "+getName(),e); + logger.error("Exception while setting attribute "+attrName+" for portlet "+getName(),e); } } Index: org/apache/jetspeed/portal/portlets/FileWatchPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/FileWatchPortlet.java,v retrieving revision 1.7 diff -u -r1.7 FileWatchPortlet.java --- org/apache/jetspeed/portal/portlets/FileWatchPortlet.java 7 May 2003 15:16:50 -0000 1.7 +++ org/apache/jetspeed/portal/portlets/FileWatchPortlet.java 19 Jul 2003 21:47:38 -0000 @@ -58,10 +58,10 @@ import org.apache.jetspeed.portal.expire.Expire; import org.apache.jetspeed.portal.expire.ExpireFactory; import org.apache.jetspeed.portal.expire.FileWatchExpire; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.JetspeedException; -//turbine stuff -import org.apache.turbine.util.Log; /** Just like AbstractPortlet except that when its URL is modified on disk it @@ -70,8 +70,13 @@ @author Kevin A. Burton @version $Id: FileWatchPortlet.java,v 1.7 2003/05/07 15:16:50 morciuch Exp $ */ -public abstract class FileWatchPortlet extends AbstractInstancePortlet { +public abstract class FileWatchPortlet extends AbstractInstancePortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(FileWatchPortlet.class.getName()); FileWatchExpire expire = null; @@ -93,7 +98,7 @@ return this.expire; } catch ( JetspeedException e ) { - Log.error( e ); + logger.error("Exception", e); return null; } Index: org/apache/jetspeed/portal/portlets/GenericMVCPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/GenericMVCPortlet.java,v retrieving revision 1.3 diff -u -r1.3 GenericMVCPortlet.java --- org/apache/jetspeed/portal/portlets/GenericMVCPortlet.java 19 Jun 2003 17:12:18 -0000 1.3 +++ org/apache/jetspeed/portal/portlets/GenericMVCPortlet.java 19 Jul 2003 21:47:38 -0000 @@ -64,16 +64,21 @@ import org.apache.jetspeed.portal.Portlet; import org.apache.jetspeed.portal.PortletException; -import org.apache.jetspeed.portal.portlets.viewprocessor.*; +import org.apache.jetspeed.portal.portlets.viewprocessor.ViewProcessor; +import org.apache.jetspeed.portal.portlets.viewprocessor.ViewProcessorFactory; +//import org.apache.jetspeed.portal.portlets.viewprocessor.*; // using the * form due to the puggable nature //ie no recompile to support new view processors +// The above * form removed. No need, as imports are only used at compile time +// Pluggable will work fine anyway. (HO) +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.PortletSessionState; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedTemplateLink; import org.apache.turbine.modules.ActionLoader; import org.apache.turbine.services.pull.TurbinePull; -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; /** @@ -131,6 +136,12 @@ */ public class GenericMVCPortlet extends AbstractInstancePortlet { + + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(GenericMVCPortlet.class.getName()); + // STW: Context keys public static final String PORTLET = "portlet"; public static final String TEMPLATE = "template"; @@ -167,7 +178,7 @@ template = getPortletConfig().getInitParameter("template"); // get viewprocessor from factory - Log.info( + logger.info( "GenericMVCPortlet - creating view processor for viewtype = " + viewType + ", template = " @@ -270,9 +281,9 @@ // of the velocity portlet and might depend on the name rundata.getTemplateInfo().setTemplateContext("VelocityPortletContext", context); - if (Log.getLogger().isDebugEnabled()) + if (logger.isDebugEnabled()) { - Log.debug( + logger.debug( "GenericMVCPortlet: Executing action [" + actionName + "] for portlet [" @@ -284,17 +295,16 @@ } catch (Exception e) { - Log.error("GenericMVCPortlet - error executing action" + e); - e.printStackTrace(); + logger.error("GenericMVCPortlet - error executing action", e); } } // Process View // call processView method - Log.info("GenericMVCPortlet - calling processView on processor"); + logger.info("GenericMVCPortlet - calling processView on processor"); ConcreteElement result = (ConcreteElement) processor.processView(context); - Log.info("GenericMVCPortlet - setting this portlet's content"); + logger.info("GenericMVCPortlet - setting this portlet's content"); clearContent(); setContent(result); // only needed when caching is true I believe Index: org/apache/jetspeed/portal/portlets/IFramePortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/IFramePortlet.java,v retrieving revision 1.5 diff -u -r1.5 IFramePortlet.java --- org/apache/jetspeed/portal/portlets/IFramePortlet.java 11 Jun 2003 21:47:47 -0000 1.5 +++ org/apache/jetspeed/portal/portlets/IFramePortlet.java 19 Jul 2003 21:47:39 -0000 @@ -61,10 +61,11 @@ //Jetspeed stuff import org.apache.jetspeed.portal.PortletException; import org.apache.jetspeed.portal.PortletConfig; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; //turbine import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; import org.apache.turbine.util.ServerData; import org.apache.turbine.services.servlet.TurbineServlet; import org.apache.turbine.TurbineConstants; @@ -121,6 +122,11 @@ public class IFramePortlet extends AbstractInstancePortlet { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(IFramePortlet.class.getName()); + static final String DEFAULT_NOTSUPP_MSG = "[Your user agent does not support inline frames or is currently" + " configured not to display frames]"; @@ -188,7 +194,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } // Add portlet name variable replacement parms.put("portlet", this.getName()); @@ -339,7 +345,7 @@ } catch (PortletException pe) { - Log.error(pe); + logger.error("Exception", pe); } } @@ -620,7 +626,7 @@ } catch (Exception e) { - Log.error("Exception in init()", e); + logger.error("Exception in init()", e); throw new PortletException(e.getMessage()); } } Index: org/apache/jetspeed/portal/portlets/JetspeedContent.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/JetspeedContent.java,v retrieving revision 1.24 diff -u -r1.24 JetspeedContent.java --- org/apache/jetspeed/portal/portlets/JetspeedContent.java 7 May 2003 15:16:50 -0000 1.24 +++ org/apache/jetspeed/portal/portlets/JetspeedContent.java 19 Jul 2003 21:47:39 -0000 @@ -63,11 +63,10 @@ import org.apache.jetspeed.util.JetspeedClearElement; import org.apache.jetspeed.util.SimpleTransform; import org.apache.jetspeed.cache.disk.JetspeedDiskCache; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.resources.JetspeedResources; -//turbine -import org.apache.turbine.util.Log; - //XML stuff import org.xml.sax.SAXException; @@ -82,8 +81,14 @@ @author Kevin A. Burton @version $Id: JetspeedContent.java,v 1.24 2003/05/07 15:16:50 morciuch Exp $ */ -public class JetspeedContent extends FileWatchPortlet { +public class JetspeedContent extends FileWatchPortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedContent.class.getName()); + public static final String PROVIDER_NAME_KEY = "provider-name"; /** @@ -153,7 +158,7 @@ this.lastModified = JetspeedDiskCache.getInstance() .getEntry( this.url ).getLastModified(); } catch ( IOException e ) { - Log.error( e ); + logger.error("Exception", e); } } @@ -174,7 +179,7 @@ this.stylesheet = JetspeedDiskCache.getInstance() .getEntry( this.stylesheet ).getURL(); } catch (IOException e) { - Log.error( "Couldn't transform content.", e ); + logger.error( "Couldn't transform content.", e ); throw new PortletException( "Couldn't transform content. Please see error log" ); } @@ -184,7 +189,7 @@ return new JetspeedClearElement( SimpleTransform.transform( url, stylesheet ) ); } catch (SAXException e) { - Log.error( "Couldn't transform content.", e ); + logger.error( "Couldn't transform content.", e ); throw new PortletException( "Couldn't transform content. Please see error log" ); } Index: org/apache/jetspeed/portal/portlets/NewRSSPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/NewRSSPortlet.java,v retrieving revision 1.20 diff -u -r1.20 NewRSSPortlet.java --- org/apache/jetspeed/portal/portlets/NewRSSPortlet.java 30 Jun 2003 18:57:26 -0000 1.20 +++ org/apache/jetspeed/portal/portlets/NewRSSPortlet.java 19 Jul 2003 21:47:39 -0000 @@ -74,10 +74,11 @@ import org.apache.jetspeed.xml.JetspeedXMLEntityResolver; import org.apache.jetspeed.capability.CapabilityMap; import org.apache.jetspeed.capability.CapabilityMapFactory; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; //turbine -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; //JAXP support @@ -111,8 +112,14 @@ @author Raphaël Luta @version $Id: NewRSSPortlet.java,v 1.20 2003/06/30 18:57:26 morciuch Exp $ */ -public class NewRSSPortlet extends FileWatchPortlet { +public class NewRSSPortlet extends FileWatchPortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(NewRSSPortlet.class.getName()); + public final static String ERROR_NOT_VALID = "This does not appear to be an RSS document"; public final static String INVALID_TYPE = "Unable to display for this browser"; @@ -177,7 +184,7 @@ String message = "RSSPortlet: Couldn't parse out XML document -> " + url; - Log.error( message, t ); + logger.error( message, t ); throw new PortletException( t.getMessage() ); } @@ -252,7 +259,7 @@ } catch (PortletException pe) { - Log.error(pe); + logger.error("Exception", pe); } } CapabilityMap map = ((JetspeedRunData)data).getCapability(); @@ -270,7 +277,7 @@ this.params ) ); setContent( content, map ); } catch ( SAXException e ) { - Log.error( e ); + logger.error("Exception", e); content = new JetspeedClearElement(e.getMessage()); } } Index: org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java,v retrieving revision 1.44 diff -u -r1.44 PortletInfoPortlet.java --- org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java 7 May 2003 15:16:50 -0000 1.44 +++ org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java 19 Jul 2003 21:47:40 -0000 @@ -76,12 +76,13 @@ import org.apache.jetspeed.portal.PortletException; import org.apache.jetspeed.services.PortletFactory; import org.apache.jetspeed.cache.disk.JetspeedDiskCache; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedLinkFactory; //Turbine -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; /** @@ -100,8 +101,14 @@ @author Kevin A. Burton @version $Id: PortletInfoPortlet.java,v 1.44 2003/05/07 15:16:50 morciuch Exp $ */ -public class PortletInfoPortlet extends AbstractPortlet { +public class PortletInfoPortlet extends AbstractPortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PortletInfoPortlet.class.getName()); + public static final String THIRDPARTY_PORTLETRENDERER_URL_KEY = "thirdparty.portletrenderer.url"; public static final String THIRDPARTY_PORTLETRENDERER_CAPTION_KEY = "thirdparty.portletrenderer.caption"; @@ -132,7 +139,7 @@ if ( portletName == null ) { String message = "Could not find given entry "; - Log.error( message ); + logger.error( message ); return new StringElement( message ); } @@ -140,7 +147,7 @@ try { portlet = PortletFactory.getPortlet( portletName, "0" ); } catch (PortletException e) { - Log.error(e); + logger.error("Exception", e); return new StringElement( e.getMessage() ); } @@ -158,7 +165,7 @@ long urlExpires = JetspeedDiskCache.getInstance().getEntry( url ).getExpirationTime(); t.addElement( this.getRow( "URL expires: " + df.format( new Date(urlExpires) ) ) ); } catch ( IOException e ) { - Log.error( e ); + logger.error("Exception", e); } } @@ -192,7 +199,7 @@ } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); } JetspeedLinkFactory.putInstance(jsLink); Index: org/apache/jetspeed/portal/portlets/PreviewPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/PreviewPortlet.java,v retrieving revision 1.3 diff -u -r1.3 PreviewPortlet.java --- org/apache/jetspeed/portal/portlets/PreviewPortlet.java 4 Mar 2003 00:05:04 -0000 1.3 +++ org/apache/jetspeed/portal/portlets/PreviewPortlet.java 19 Jul 2003 21:47:40 -0000 @@ -59,8 +59,9 @@ import org.apache.jetspeed.services.PortletFactory; import org.apache.jetspeed.portal.PortletControl; import org.apache.jetspeed.services.PortalToolkit; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.services.rundata.JetspeedRunData; -//import org.apache.jetspeed.util.rewriter.PreviewRewriter; import org.apache.jetspeed.util.template.JetspeedLink; import org.apache.jetspeed.util.template.JetspeedLinkFactory; @@ -69,7 +70,6 @@ import org.apache.ecs.ConcreteElement; // turbine -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.services.velocity.TurbineVelocity; import org.apache.velocity.context.Context; @@ -86,6 +86,11 @@ { /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PreviewPortlet.class.getName()); + + /** * @param rundata The RunData object for the current request */ public ConcreteElement getContent(RunData rundata) @@ -117,7 +122,7 @@ return new JetspeedClearElement(""); } catch (Exception e) { - Log.error(e); + logger.error("Exception", e); rundata.setScreenTemplate("Home"); return new JetspeedClearElement(""); } @@ -162,7 +167,7 @@ } catch ( Exception e ) { - Log.error(e); + logger.error("Exception", e); result = new JetspeedClearElement("This resource is temporarily unavailable"); } Index: org/apache/jetspeed/portal/portlets/RSSPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/RSSPortlet.java,v retrieving revision 1.50 diff -u -r1.50 RSSPortlet.java --- org/apache/jetspeed/portal/portlets/RSSPortlet.java 7 May 2003 15:16:50 -0000 1.50 +++ org/apache/jetspeed/portal/portlets/RSSPortlet.java 19 Jul 2003 21:47:40 -0000 @@ -67,12 +67,10 @@ import org.apache.jetspeed.util.SimpleTransform; import org.apache.jetspeed.cache.disk.JetspeedDiskCache; import org.apache.jetspeed.portal.PortletException; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.xml.JetspeedXMLEntityResolver; - -//turbine -import org.apache.turbine.util.Log; - //JAXP support import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -91,8 +89,14 @@ @author Santiago Gala @version $Id: RSSPortlet.java,v 1.50 2003/05/07 15:16:50 morciuch Exp $ */ -public class RSSPortlet extends FileWatchPortlet { +public class RSSPortlet extends FileWatchPortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(RSSPortlet.class.getName()); + public final static String ERROR_NOT_VALID = "This does not appear to be an RSS document"; /** @@ -137,7 +141,7 @@ String message = "RSSPortlet: Couldn't parse out XML document -> " + url; - Log.error( message, t ); + logger.error( message, t ); throw new PortletException( t.getMessage() ); } @@ -200,7 +204,7 @@ } catch ( SAXException e ) { - Log.error( e ); + logger.error("Exception", e); throw new PortletException( e.getMessage() ); } } catch (Throwable t) { @@ -208,7 +212,7 @@ url; - Log.error( message, t ); + logger.error( message, t ); throw new PortletException( t.getMessage() ); } Index: org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java,v retrieving revision 1.3 diff -u -r1.3 ServletInvokerPortlet.java --- org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java 7 May 2003 15:16:50 -0000 1.3 +++ org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java 19 Jul 2003 21:47:40 -0000 @@ -59,20 +59,25 @@ import org.apache.ecs.StringElement; import org.apache.jetspeed.portal.PortletConfig; - -import org.apache.turbine.util.Log; -import org.apache.turbine.util.RunData; - +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.portal.portlets.AbstractPortlet; import org.apache.jetspeed.util.servlet.EcsServletElement; +import org.apache.turbine.util.RunData; + /** * The ServletInvokerPortlet invokes a servlet or JSP and displays the result. * * @author Thomas Schaeck (schaeck@de.ibm.com) */ -public class ServletInvokerPortlet extends AbstractPortlet { +public class ServletInvokerPortlet extends AbstractPortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ServletInvokerPortlet.class.getName()); /** * Returns an ECS concrete element that includes the servlet/JSP. @@ -91,7 +96,7 @@ } catch (Exception e) { String message = "ServletInvokerPortlet: Error invoking " + servletURL + ": " + e.getMessage(); - Log.error(message, e); + logger.error(message, e); return new StringElement(message); } } } Index: org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java,v retrieving revision 1.11 diff -u -r1.11 TurbineScreenPortlet.java --- org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java 7 May 2003 15:16:50 -0000 1.11 +++ org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java 19 Jul 2003 21:47:41 -0000 @@ -67,9 +67,10 @@ //standard Jetspeed stuff import org.apache.jetspeed.portal.PortletConfig; import org.apache.jetspeed.portal.PortletException; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; //turbine stuff -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; import org.apache.turbine.modules.ScreenLoader; @@ -100,6 +101,11 @@ */ public class TurbineScreenPortlet extends AbstractPortlet { + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(TurbineScreenPortlet.class.getName()); + private String screen = null; private String bgcolor = null; private String classes = null; @@ -124,7 +130,7 @@ catch ( Exception e ) { String message = "TurbineScreenPortlet: " + e.getMessage(); - Log.error( message, e ); + logger.error( message, e ); content.addElement( message ); } return ( content ); @@ -182,7 +188,7 @@ catch ( Exception e ) { String message = "TurbineScreenPortlet: " + e.getMessage(); - Log.error( message, e ); + logger.error( message, e ); } } Index: org/apache/jetspeed/portal/portlets/WMLFilePortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WMLFilePortlet.java,v retrieving revision 1.9 diff -u -r1.9 WMLFilePortlet.java --- org/apache/jetspeed/portal/portlets/WMLFilePortlet.java 7 May 2003 15:16:50 -0000 1.9 +++ org/apache/jetspeed/portal/portlets/WMLFilePortlet.java 19 Jul 2003 21:47:41 -0000 @@ -64,10 +64,10 @@ import org.apache.jetspeed.util.JetspeedClearElement; import org.apache.jetspeed.util.MimeType; import org.apache.jetspeed.cache.disk.JetspeedDiskCache; - +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; //turbine -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; //standard java stuff @@ -95,8 +95,13 @@ * @author Raphaël Luta * @version $Id: WMLFilePortlet.java,v 1.9 2003/05/07 15:16:50 morciuch Exp $ */ -public class WMLFilePortlet extends FileWatchPortlet { - +public class WMLFilePortlet extends FileWatchPortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(WMLFilePortlet.class.getName()); + private ConcreteElement content = new StringElement("Not available"); /** @@ -159,7 +164,7 @@ parser.parse(uri); } catch (Exception e) { - Log.error( e ); + logger.error("Exception", e); } } @@ -211,15 +216,15 @@ } public void warning(SAXParseException ex) { - Log.info(getLocationString(ex)+": "+ex.getMessage()); + logger.info(getLocationString(ex)+": "+ex.getMessage()); } public void error(SAXParseException ex) { - Log.error(getLocationString(ex)+": "+ex,ex); + logger.error(getLocationString(ex)+": "+ex, ex); } public void fatalError(SAXParseException ex) throws SAXException { - Log.error(getLocationString(ex)+": "+ex,ex); + logger.error(getLocationString(ex)+": "+ex, ex); throw ex; } Index: org/apache/jetspeed/portal/portlets/WebPagePortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet.java,v retrieving revision 1.14 diff -u -r1.14 WebPagePortlet.java --- org/apache/jetspeed/portal/portlets/WebPagePortlet.java 17 Apr 2003 15:47:22 -0000 1.14 +++ org/apache/jetspeed/portal/portlets/WebPagePortlet.java 19 Jul 2003 21:47:41 -0000 @@ -61,11 +61,12 @@ //Jetspeed stuff import org.apache.jetspeed.portal.PortletConfig; import org.apache.jetspeed.portal.PortletException; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.HTMLRewriter; import org.apache.jetspeed.util.Base64; //turbine -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; //standard java stuff @@ -85,8 +86,13 @@ *@author David Sean Taylor *@author David G. Powers */ -public class WebPagePortlet extends AbstractInstancePortlet { - +public class WebPagePortlet extends AbstractInstancePortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(WebPagePortlet.class.getName()); + protected HTMLRewriter rewriter = null; protected boolean initDone = false; protected boolean contentStale = true; @@ -136,7 +142,7 @@ contentStale = true; initDone = true; } catch (Exception e) { - Log.info("Exception occurred:" + e.toString()); + logger.info("Exception occurred:" + e.toString()); e.printStackTrace(); throw new PortletException( e.toString() ); } @@ -165,8 +171,7 @@ } catch (Exception e) { - Log.info("Exception occurred:" + e.toString()); - e.printStackTrace(); + logger.info("Exception occurred:" + e.toString(), e); } long pageExpiration = pageConn.getExpiration(); @@ -225,7 +230,7 @@ if (pageExpiration > System.currentTimeMillis() && (cacheContent == true)) { contentStale = false; - Log.debug( "WebPagePortlet caching URL: " + + logger.debug( "WebPagePortlet caching URL: " + url + " Expiration: " + pageExpiration + @@ -286,8 +291,7 @@ htmlReader.close(); } catch (Exception e) { - Log.info("Exception occurred:" + e.toString()); - e.printStackTrace(); + logger.info("Exception occurred:" + e.toString(), e); } return element; Index: org/apache/jetspeed/portal/portlets/WebPagePortlet2.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet2.java,v retrieving revision 1.2 diff -u -r1.2 WebPagePortlet2.java --- org/apache/jetspeed/portal/portlets/WebPagePortlet2.java 7 May 2003 15:16:50 -0000 1.2 +++ org/apache/jetspeed/portal/portlets/WebPagePortlet2.java 19 Jul 2003 21:47:42 -0000 @@ -61,12 +61,13 @@ //Jetspeed stuff import org.apache.jetspeed.portal.PortletConfig; import org.apache.jetspeed.portal.PortletException; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.rewriter.Rewriter; import org.apache.jetspeed.util.rewriter.HTMLRewriter; import org.apache.jetspeed.util.Base64; //turbine -import org.apache.turbine.util.Log; import org.apache.turbine.util.RunData; //standard java stuff @@ -82,8 +83,14 @@ * * @author David Sean Taylor */ -public class WebPagePortlet2 extends AbstractInstancePortlet { +public class WebPagePortlet2 extends AbstractInstancePortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(WebPagePortlet2.class.getName()); + protected Rewriter rewriter = null; protected boolean initDone = false; protected boolean contentStale = true; @@ -113,8 +120,7 @@ contentStale = true; initDone = true; } catch (Exception e) { - Log.info("Exception occurred:" + e.toString()); - e.printStackTrace(); + logger.info("Exception occurred:" + e.toString(), e); throw new PortletException( e.toString() ); } } @@ -144,8 +150,7 @@ } catch (Exception e) { - Log.info("Exception occurred:" + e.toString()); - e.printStackTrace(); + logger.info("Exception occurred:" + e.toString(), e); } long pageExpiration = pageConn.getExpiration(); @@ -189,9 +194,9 @@ if (pageExpiration > System.currentTimeMillis() && (cacheContent == true)) { contentStale = false; - if ( Log.getLogger().isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - Log.debug( "WebPagePortlet caching URL: " + + logger.debug( "WebPagePortlet caching URL: " + url + " Expiration: " + pageExpiration + @@ -252,8 +257,7 @@ htmlReader.close(); } catch (Exception e) { - Log.info("Exception occurred:" + e.toString()); - e.printStackTrace(); + logger.info("Exception occurred:" + e.toString(), e); } return element; Index: org/apache/jetspeed/portal/portlets/XMLPortlet.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/XMLPortlet.java,v retrieving revision 1.19 diff -u -r1.19 XMLPortlet.java --- org/apache/jetspeed/portal/portlets/XMLPortlet.java 7 Mar 2001 06:47:17 -0000 1.19 +++ org/apache/jetspeed/portal/portlets/XMLPortlet.java 19 Jul 2003 21:47:42 -0000 @@ -56,14 +56,19 @@ import java.io.ByteArrayOutputStream; import java.io.PrintWriter; + import org.apache.ecs.html.Comment; import org.apache.ecs.ConcreteElement; import org.apache.ecs.StringElement; import org.apache.ecs.ElementContainer; + import org.apache.jetspeed.cache.disk.JetspeedDiskCache; +import org.apache.jetspeed.services.logging.JetspeedLogFactoryService; +import org.apache.jetspeed.services.logging.JetspeedLogger; import org.apache.jetspeed.util.SAXPIFilter; + import org.apache.turbine.util.RunData; -import org.apache.turbine.util.Log; + /** Portlet to output an XML well-formed document without any rendering. @@ -73,9 +78,13 @@ @author Raphaël Luta @version $Id: XMLPortlet.java,v 1.19 2001/03/07 06:47:17 taylor Exp $ */ -public class XMLPortlet extends AbstractPortlet { - - +public class XMLPortlet extends AbstractPortlet +{ + /** + * Static initialization of the logger for this class + */ + private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(XMLPortlet.class.getName()); + /** Return the PI-stripped XML document wrapped in an ECS ElementContainer */ @@ -98,7 +107,7 @@ } catch (Exception e) { - Log.error( "Could not parse the following URL: " + this.getPortletConfig().getURL(), e ); + logger.error( "Could not parse the following URL: " + this.getPortletConfig().getURL(), e ); return content; }