Index: WEB-INF/web.xml
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/web.xml,v
retrieving revision 1.9
diff -u -r1.9 web.xml
--- WEB-INF/web.xml	19 May 2003 23:19:15 -0000	1.9
+++ WEB-INF/web.xml	22 Jul 2003 22:53:12 -0000
@@ -24,7 +24,10 @@
             <param-name>resources</param-name>
             <param-value>org.apache.jetspeed.services.resources.JetspeedResourceService</param-value>            
         </init-param>    
-
+        <init-param>
+            <param-name>logging</param-name>
+            <param-value>org.apache.jetspeed.services.logging.JetspeedLoggingService</param-value>            
+        </init-param>    
         <load-on-startup>1</load-on-startup>
     </servlet>
 
Index: WEB-INF/conf/JetspeedResources.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.105
diff -u -r1.105 JetspeedResources.properties
--- WEB-INF/conf/JetspeedResources.properties	17 Jul 2003 22:05:13 -0000	1.105
+++ WEB-INF/conf/JetspeedResources.properties	22 Jul 2003 22:53:13 -0000
@@ -488,10 +488,12 @@
 services.PortletStats.classname = org.apache.jetspeed.services.portletstats.JetspeedPortletStatsService
 
 # Name of the log4j logger defined in tr.props
-services.PortletStats.logger = access
+# This setting discontinued as of 1.4b5
+# services.PortletStats.logger = access
 
 # If true, logging will occur
-services.PortletStats.enabled = false
+# This setting discontinued as of 1.4b5
+# services.PortletStats.enabled = false
 
 # Portlets to exclude from logging (not implemented)
 services.PortletStats.excludePortlets=
@@ -644,3 +646,13 @@
 services.ForwardService.mapping=/WEB-INF/conf/forwards-mapping.xml
 services.ForwardService.directory=/WEB-INF/conf/forwards/
 
+#########################################
+# JetspeedLogFactory Service            #
+#########################################
+# If this file has extension properties, then log4j property configuration is done. 
+# Otherwise DOM configuration for XML
+log4j.properties=/WEB-INF/conf/log4j.properties
+# If true, Log4J will monitor the property file and reconfigure if changed.
+log4j.configureAndWatch=true
+# Number of ms between each property file check
+log4j.watchInterval=60000

Index: WEB-INF/conf/TurbineResources.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v
retrieving revision 1.70
diff -u -r1.70 TurbineResources.properties
--- WEB-INF/conf/TurbineResources.properties	19 May 2003 23:19:15 -0000	1.70
+++ WEB-INF/conf/TurbineResources.properties	22 Jul 2003 22:53:14 -0000
@@ -19,8 +19,8 @@
 #
 # destination.file: A path relative to the web app root
 # -------------------------------------------------------------------
-services.LoggingService.facilities=logforj,access
-services.LoggingService.default=logforj
+services.LoggingService.facilities=jetspeed,log4j
+services.LoggingService.default=jetspeed
 services.LoggingService.loggingConfig=org.apache.turbine.services.logging.PropertiesLoggingConfig
 
 # A facility for system logging.
@@ -82,30 +82,29 @@
 
 # An example configuration for automatic log rotation using Log4Java
 # This will keep the log file size under 1MB and save up to 5 backup copies
-services.LoggingService.rotation.log4j.rootCategory = INFO, rotation
-services.LoggingService.rotation.log4j.category.rotation = DEBUG, rotation
+##services.LoggingService.rotation.log4j.rootCategory = INFO, rotation
+##services.LoggingService.rotation.log4j.category.rotation = DEBUG, rotation
 
-services.LoggingService.rotation.log4j.appender.rotation.file = ${webappRoot}/WEB-INF/log/jetspeed.log
-services.LoggingService.rotation.log4j.appender.rotation = org.apache.log4j.RollingFileAppender
-services.LoggingService.rotation.log4j.appender.rotation.layout = org.apache.log4j.PatternLayout
-services.LoggingService.rotation.log4j.appender.rotation.layout.conversionPattern = [%d{dd MMM yyyy HH:mm:ss} %5p] - %m%n
-services.LoggingService.rotation.log4j.appender.rotation.append = false
-services.LoggingService.rotation.log4j.appender.rotation.MaxFileSize = 1024KB
-services.LoggingService.rotation.log4j.appender.rotation.MaxBackupIndex = 5
-services.LoggingService.rotation.className = org.apache.turbine.services.logging.Log4JavaLogger
-services.LoggingService.rotation.level = DEBUG
+##services.LoggingService.rotation.log4j.appender.rotation.file = ${webappRoot}/WEB-INF/log/jetspeed.log
+##services.LoggingService.rotation.log4j.appender.rotation = org.apache.log4j.RollingFileAppender
+##services.LoggingService.rotation.log4j.appender.rotation.layout = org.apache.log4j.PatternLayout
+##services.LoggingService.rotation.log4j.appender.rotation.layout.conversionPattern = [%d{dd MMM yyyy HH:mm:ss} %5p] - %m%n
+##services.LoggingService.rotation.log4j.appender.rotation.append = false
+##services.LoggingService.rotation.log4j.appender.rotation.MaxFileSize = 1024KB
+##services.LoggingService.rotation.className = org.apache.turbine.services.logging.Log4JavaLogger
+##services.LoggingService.rotation.level = DEBUG
 
 # An example configuration for using *NIX syslogd with Log4Java
-services.LoggingService.syslog.destination.syslogd.host=my.syslog.server.com
-services.LoggingService.syslog.destination.syslogd.facility=LOG_DAEMON
-services.LoggingService.syslog.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.LoggingService.syslog.level=INFO
+##services.LoggingService.syslog.destination.syslogd.host=my.syslog.server.com
+##services.LoggingService.syslog.destination.syslogd.facility=LOG_DAEMON
+##services.LoggingService.syslog.className=org.apache.turbine.services.logging.Log4JavaLogger
+##services.LoggingService.syslog.level=INFO
 
 # An example configuration for using remote Log4Java server
-services.LoggingService.remote.destination.remote.host=my.remote.server.com
-services.LoggingService.remote.destination.remote.port=1099
-services.LoggingService.remote.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.LoggingService.remote.level=INFO
+##services.LoggingService.remote.destination.remote.host=my.remote.server.com
+##services.LoggingService.remote.destination.remote.port=1099
+##services.LoggingService.remote.className=org.apache.turbine.services.logging.Log4JavaLogger
+##services.LoggingService.remote.level=INFO
 
 # An example configuration for sending error reports as email with Log4Java
 # notes:
@@ -113,13 +112,13 @@
 # * log4j will send the email when an ERROR is logged, with
 #   'buffer.size' previous (non-ERROR) logs included in the email
 # * configured to log to a file as well otherwise stacktraces are lost
-services.LoggingService.email.destination.file=/WEB-INF/log/jetspeed.log
-services.LoggingService.email.destination.email.from=root@localhost
-services.LoggingService.email.destination.email.to=root@localhost
-services.LoggingService.email.destination.email.subject=Jetspeed Error Report
-services.LoggingService.email.destination.email.buffer.size=512
-services.LoggingService.email.className=org.apache.turbine.services.logging.Log4JavaLogger
-services.LoggingService.email.level=INFO
+##services.LoggingService.email.destination.file=/WEB-INF/log/jetspeed.log
+##services.LoggingService.email.destination.email.from=root@localhost
+##services.LoggingService.email.destination.email.to=root@localhost
+##services.LoggingService.email.destination.email.subject=Jetspeed Error Report
+##services.LoggingService.email.destination.email.buffer.size=512
+##services.LoggingService.email.className=org.apache.turbine.services.logging.Log4JavaLogger
+##services.LoggingService.email.level=INFO
 
 # -------------------------------------------------------------------
 # SMTP-From header for your outgoing messages
@@ -364,8 +363,9 @@
 # that depend on other services during initialization.
 # -------------------------------------------------------------------
 services.ResourceService.classname=org.apache.jetspeed.services.resources.JetspeedResourceService
-
-services.LoggingService.classname=org.apache.turbine.services.logging.TurbineLoggingService
+services.JetspeedLogFactoryService.classname=org.apache.jetspeed.services.logging.JetspeedLogFactoryService
+##services.LoggingService.classname=org.apache.turbine.services.logging.TurbineLoggingService
+services.LoggingService.classname = org.apache.jetspeed.services.logging.JetspeedLoggingService
 services.ComponentService.classname=org.apache.turbine.services.component.TurbineComponentService
 services.FactoryService.classname=org.apache.turbine.services.factory.TurbineFactoryService
 services.PoolService.classname=org.apache.turbine.services.pool.TurbinePoolService
Index: WEB-INF/conf/log4j.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/conf/log4j.properties,v
retrieving revision 1.1
diff -u -r1.1 log4j.properties
--- WEB-INF/conf/log4j.properties	23 Dec 2002 23:14:49 -0000	1.1
+++ WEB-INF/conf/log4j.properties	22 Jul 2003 22:53:14 -0000
@@ -22,7 +22,7 @@
 # jetspeed.log. Add "stdout" to the list for console logging.
 #
 log4j.rootLogger = INFO, jetspeed
-
+log4j.debug = true
 #
 # Jetspeed goes into Jetspeed Log
 #
@@ -30,28 +30,26 @@
 log4j.additivity.org.apache.jetspeed = false
 
 #
-# Turbine goes into Turbine Log
-#
-log4j.category.org.apache.turbine = INFO, turbine
-log4j.additivity.org.apache.turbine = false
-
-#
-# Torque has its own log file
+# Jetspeed services goes into Jetspeed Services Log
 #
-log4j.category.org.apache.torque = INFO, torque
-log4j.additivity.org.apache.torque = false
+log4j.category.org.apache.jetspeed.services = DEBUG, jetspeedsrv
+log4j.additivity.org.apache.jetspeed.services = false
+# Setting CastorPsmlManagerService to higher level, as it is quite verbose on DEBUG
+log4j.category.org.apache.jetspeed.services.psmlmanager.CastorPsmlManagerService = INFO, jetspeedsrv
+log4j.additivity.org.apache.jetspeed.services.psmlmanager.CastorPsmlManagerService = false
 
 #
-# Velocity Logfile
+# Turbine goes into Turbine Log
+# JetspeedLoggingService handles all logging thru TurbineLoggingService
 #
-log4j.category.velocity = INFO, velocity
-log4j.additivity.velocity = false
+log4j.category.org.apache.jetspeed.services.logging.JetspeedLoggingService = INFO, turbine
+log4j.additivity.org.apache.jetspeed.services.logging.JetspeedLoggingService = false
 
 #
 # Portlet access Category
 #
-log4j.category.access = INFO, access
-log4j.additivity.access = false
+log4j.category.org.apache.jetspeed.services.PortletStats = INFO, access
+log4j.additivity.org.apache.jetspeed.services.PortletStats = false
 
 #
 # Console output Category
@@ -74,6 +72,12 @@
 log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n
 log4j.appender.jetspeed.append = false
 
+log4j.appender.jetspeedsrv = org.apache.log4j.FileAppender
+log4j.appender.jetspeedsrv.file = ${webappRoot}/WEB-INF/log/jetspeedservices.log
+log4j.appender.jetspeedsrv.layout = org.apache.log4j.PatternLayout
+log4j.appender.jetspeedsrv.layout.conversionPattern = %d [%t] %-5p %c - %m%n
+log4j.appender.jetspeedsrv.append = false
+
 #log4j.appender.jetspeed = org.apache.log4j.RollingFileAppender
 #log4j.appender.jetspeed.file = ${webappRoot}/WEB-INF/log/rotation.log
 #log4j.appender.jetspeed.MaxFileSize = 50KB
@@ -91,15 +95,6 @@
 log4j.appender.turbine.append = false
 
 #
-# torque.log
-# 
-log4j.appender.torque = org.apache.log4j.FileAppender
-log4j.appender.torque.file = ${webappRoot}/WEB-INF/log/torque.log
-log4j.appender.torque.layout = org.apache.log4j.PatternLayout
-log4j.appender.torque.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.torque.append = false
-
-#
 # Portlet access Output
 #
 log4j.appender.access = org.apache.log4j.FileAppender
@@ -107,16 +102,6 @@
 log4j.appender.access.layout = org.apache.log4j.PatternLayout
 log4j.appender.access.layout.conversionPattern = %m%n
 log4j.appender.access.append = true
-
-#
-# Velocity gets configured to write its output onto the velocity
-# category.
-#
-log4j.appender.velocity = org.apache.log4j.FileAppender
-log4j.appender.velocity.file = ${webappRoot}/WEB-INF/log/velocity.log
-log4j.appender.velocity.layout = org.apache.log4j.PatternLayout
-log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n
-log4j.appender.velocity.append = false
 
 #
 # Console Output
Index: WEB-INF/conf/my.properties
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/webapp/WEB-INF/conf/my.properties,v
retrieving revision 1.2
diff -u -r1.2 my.properties
--- WEB-INF/conf/my.properties	15 Jul 2003 16:12:29 -0000	1.2
+++ WEB-INF/conf/my.properties	22 Jul 2003 22:53:15 -0000
@@ -26,8 +26,8 @@
 # To override the turbine logging settings, you will need to set the 'logging' init
 # parameter in web.xml to 'org.apache.jetspeed.services.logging.JetspeedLoggingService'
 #
-services.LoggingService.facilities = debug,logforj,access
-services.LoggingService.default = debug
+# services.LoggingService.facilities = debug,logforj,access
+# services.LoggingService.default = debug
 
 # -------------------------------------------------------------------
 #