portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r413035 - in /portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly: administration.xml ajax-layout.xml
Date Fri, 09 Jun 2006 12:51:38 GMT
Author: ate
Date: Fri Jun  9 05:51:37 2006
New Revision: 413035

URL: http://svn.apache.org/viewvc?rev=413035&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/src/webapp/WEB-INF/assembly/administration.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml?rev=413035&r1=413034&r2=413035&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/administration.xml Fri Jun  9 05:51:37
2006
@@ -26,10 +26,15 @@
     <property name="resourceLoaderPath"><value>/WEB-INF/templates/</value></property>
     <property name="velocityProperties">
       <props>
+        <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger
-->
+        <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
+        <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
         <!-- clear out default global VM_global_library.vm leading to ERROR logging because
its not available -->
         <prop key="velocimacro.library"></prop>
       </props>
     </property>
+    <!--  use our own CommonsLoggingLog4JLogSystem specified above, not the default one
provided by Spring -->
+    <property name="overrideLogging"><value>false</value></property>
 </bean>
   
 <bean id='PortalAdministrationImpl' init-method="start"

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml?rev=413035&r1=413034&r2=413035&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax-layout.xml Fri Jun  9 05:51:37
2006
@@ -324,6 +324,9 @@
 <bean id="AjaxVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
     <property name="velocityProperties">
         <props>
+           <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger
-->
+           <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
+           <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
             <!-- clear out default global VM_global_library.vm leading to ERROR logging
because its not available -->
             <prop key="velocimacro.library"></prop>
             <prop key="resource.loader">class</prop>
@@ -332,6 +335,8 @@
             </prop>
         </props>
     </property>
+    <!--  use our own CommonsLoggingLog4JLogSystem specified above, not the default one
provided by Spring -->
+    <property name="overrideLogging"><value>false</value></property>
   </bean>
   
 	<bean id="layoutValve"



---------------------------------------------------------------------
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