portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r413037 - in /portals/jetspeed-2/trunk/applications: demo/src/webapp/WEB-INF/ demo/src/webapp/WEB-INF/velocity/ j2-admin/src/webapp/WEB-INF/ j2-admin/src/webapp/WEB-INF/velocity/ rss/src/webapp/WEB-INF/ rss/src/webapp/WEB-INF/velocity/
Date Fri, 09 Jun 2006 12:54:32 GMT
Author: ate
Date: Fri Jun  9 05:54:31 2006
New Revision: 413037

URL: http://svn.apache.org/viewvc?rev=413037&view=rev
Log:
Adding Commons Logging support for Velocity, JS2-543
See: http://issues.apache.org/jira/browse/JS2-543

Modified:
    portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/log4j.properties
    portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/velocity/velocity.properties
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/log4j.properties
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/velocity/velocity.properties
    portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/log4j.properties
    portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/velocity/velocity.properties

Modified: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/log4j.properties?rev=413037&r1=413036&r2=413037&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/log4j.properties (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/log4j.properties Fri Jun
 9 05:54:31 2006
@@ -28,6 +28,12 @@
 log4j.category.org.apache.jetspeed = DEBUG, pa
 log4j.additivity.org.apache.jetspeed = false
 
+#
+# Velocity
+#
+log4j.category.velocity = INFO, velocity
+log4j.additivity.velocity = false
+
 ########################################################################
 #
 # Logfile definitions
@@ -42,3 +48,12 @@
 log4j.appender.pa.layout = org.apache.log4j.PatternLayout
 log4j.appender.pa.layout.conversionPattern = %d [%t] %-5p %c - %m%n
 log4j.appender.pa.append = false
+
+#
+# velocity.log
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${webApplicationRoot}/logs/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

Modified: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/velocity/velocity.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/velocity/velocity.properties?rev=413037&r1=413036&r2=413037&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/velocity/velocity.properties
(original)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/velocity/velocity.properties
Fri Jun  9 05:54:31 2006
@@ -27,6 +27,11 @@
 
 runtime.log = velocity.log
 
+# use Commons Logging for routing Velocity message through our IsolatedLog4JLogger
+runtime.log.logsystem.class =org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+# Log4J Category used (default is "velocity")
+runtime.log.logsystem.log4j.category = velocity
+
 #----------------------------------------------------------------------------
 # T E M P L A T E  E N C O D I N G
 #----------------------------------------------------------------------------
@@ -87,7 +92,7 @@
 
 velocimacro.library.autoreload = true
 velocimacro.permissions.allow.inline.to.replace.global = true
-velocimacro.library = /WEB-INF/VM_global_library.vm, /WEB-INF/velocity/velocity-macros.vm
+velocimacro.library = /WEB-INF/velocity/velocity-macros.vm
 
 #template.loader.2.public.name = URL
 #template.loader.2.description = Velocity URL Template Loader

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/log4j.properties?rev=413037&r1=413036&r2=413037&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/log4j.properties (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/log4j.properties Fri
Jun  9 05:54:31 2006
@@ -28,6 +28,12 @@
 log4j.category.org.apache.jetspeed = DEBUG, pa
 log4j.additivity.org.apache.jetspeed = false
 
+#
+# Velocity
+#
+log4j.category.velocity = INFO, velocity
+log4j.additivity.velocity = false
+
 ########################################################################
 #
 # Logfile definitions
@@ -42,3 +48,12 @@
 log4j.appender.pa.layout = org.apache.log4j.PatternLayout
 log4j.appender.pa.layout.conversionPattern = %d [%t] %-5p %c - %m%n
 log4j.appender.pa.append = false
+
+#
+# velocity.log
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${webApplicationRoot}/logs/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

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/velocity/velocity.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/velocity/velocity.properties?rev=413037&r1=413036&r2=413037&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/velocity/velocity.properties
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/velocity/velocity.properties
Fri Jun  9 05:54:31 2006
@@ -27,6 +27,11 @@
 
 runtime.log = velocity.log
 
+# use Commons Logging for routing Velocity message through our IsolatedLog4JLogger
+runtime.log.logsystem.class =org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+# Log4J Category used (default is "velocity")
+runtime.log.logsystem.log4j.category = velocity
+
 #----------------------------------------------------------------------------
 # T E M P L A T E  E N C O D I N G
 #----------------------------------------------------------------------------
@@ -87,7 +92,7 @@
 
 velocimacro.library.autoreload = true
 velocimacro.permissions.allow.inline.to.replace.global = true
-velocimacro.library = /WEB-INF/VM_global_library.vm, /WEB-INF/velocity/velocity-macros.vm
+velocimacro.library = /WEB-INF/velocity/velocity-macros.vm
 
 #template.loader.2.public.name = URL
 #template.loader.2.description = Velocity URL Template Loader

Modified: portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/log4j.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/log4j.properties?rev=413037&r1=413036&r2=413037&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/log4j.properties (original)
+++ portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/log4j.properties Fri Jun
 9 05:54:31 2006
@@ -28,6 +28,12 @@
 log4j.category.org.apache.jetspeed = DEBUG, pa
 log4j.additivity.org.apache.jetspeed = false
 
+#
+# Velocity
+#
+log4j.category.velocity = INFO, velocity
+log4j.additivity.velocity = false
+
 ########################################################################
 #
 # Logfile definitions
@@ -42,3 +48,12 @@
 log4j.appender.pa.layout = org.apache.log4j.PatternLayout
 log4j.appender.pa.layout.conversionPattern = %d [%t] %-5p %c - %m%n
 log4j.appender.pa.append = false
+
+#
+# velocity.log
+#
+log4j.appender.velocity = org.apache.log4j.FileAppender
+log4j.appender.velocity.file = ${webApplicationRoot}/logs/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

Modified: portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/velocity/velocity.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/velocity/velocity.properties?rev=413037&r1=413036&r2=413037&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/velocity/velocity.properties
(original)
+++ portals/jetspeed-2/trunk/applications/rss/src/webapp/WEB-INF/velocity/velocity.properties
Fri Jun  9 05:54:31 2006
@@ -27,6 +27,11 @@
 
 runtime.log = velocity.log
 
+# use Commons Logging for routing Velocity message through our IsolatedLog4JLogger
+runtime.log.logsystem.class =org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+# Log4J Category used (default is "velocity")
+runtime.log.logsystem.log4j.category = velocity
+
 #----------------------------------------------------------------------------
 # T E M P L A T E  E N C O D I N G
 #----------------------------------------------------------------------------
@@ -87,7 +92,7 @@
 
 velocimacro.library.autoreload = true
 velocimacro.permissions.allow.inline.to.replace.global = true
-velocimacro.library = /WEB-INF/VM_global_library.vm, /WEB-INF/velocity/velocity-macros.vm
+velocimacro.library = /WEB-INF/velocity/velocity-macros.vm
 
 #template.loader.2.public.name = URL
 #template.loader.2.description = Velocity URL Template Loader



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message