[gatein-commits] gatein SVN: r7308 - in portal/trunk/web/portal/src/main/webapp/WEB-INF/conf: common and 1 other directory.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2011-09-06 04:34:43 -0400 (Tue, 06 Sep 2011)
New Revision: 7308

Removed:
   portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml
Modified:
   portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
Log:
GTNPORTAL-2080 : Remove embbeded logger configuration


Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml	2011-09-06 04:52:36 UTC (rev 7307)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/logs-configuration.xml	2011-09-06 08:34:43 UTC (rev 7308)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
-   xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
-  <component profiles="jboss">
-    <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
-    <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
-    <init-params>
-	<!-- Commons Simple: -->
-	<!--
-			<value-param>
-        <name>logger</name>
-        <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value>
-      </value-param>
-      <value-param>
-        <name>configurator</name>
-        <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value>
-      </value-param>
-      <properties-param>
-        <name>properties</name>
-        <description>SimpleLog properties</description>
-        <property name="org.apache.commons.logging.simplelog.defaultlog" value="info"/>
-        <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/>
-      </properties-param>
-	-->
-	<!-- end Commons Simple -->  
-	  
-	<!-- JDK -->
-			<value-param>  
-				<name>logger</name>
-				<value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value>
-			</value-param>
-			<value-param>
-				<name>configurator</name>
-				<value>org.exoplatform.services.log.impl.Jdk14Configurator</value>  
-			</value-param>
-			<properties-param>
-				<name>properties</name>
-				<description>jdk1.4 Logger properties</description>
-				<property name="handlers" value="java.util.logging.ConsoleHandler"/>
-				<property name=".level" value="FINE"/>
-				<property name="java.util.logging.ConsoleHandler.level" value="FINE"/>
-			</properties-param>
-	<!-- end JDK -->
-	<!-- Log4J -->
-	<!--
-				<value-param>
-				<name>logger</name>
-				<value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
-			</value-param>
-			<value-param>
-				<name>configurator</name>
-				<value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
-			</value-param>
-			<properties-param>
-				<name>properties</name>
-				<description>Log4J properties</description>
-				<property name="log4j.rootLogger" value="DEBUG, stdout, file"/>
-				<property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/>
-				<property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/>
-				<property name="log4j.appender.stdout.layout.ConversionPattern" value="%d {dd.MM.yyyy HH:mm:ss} %c {1}: %m (%F, line %L) %n"/>
-				<property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/>
-				<property name="log4j.appender.file.File" value="jcr.log"/>
-				<property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/>
-				<property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %m (%F, line %L) %n"/>
-			</properties-param>
-	-->
-	<!-- end Log4J-->
-    </init-params>
-  </component>
-</configuration>

Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml	2011-09-06 04:52:36 UTC (rev 7307)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/configuration.xml	2011-09-06 08:34:43 UTC (rev 7308)
@@ -27,7 +27,6 @@
    <import>war:/conf/common/common-configuration.xml</import>
    <import>war:/conf/common/resource-compressor-configuration.xml</import>
    <import>war:/conf/common/portlet-container-configuration.xml</import>
-   <import>war:/conf/common/logs-configuration.xml</import>
    <import>war:/conf/common/autologin-configuration.xml</import>
    <import>war:/conf/common/remindpwd-configuration.xml</import>
    <import>war:/conf/jcr/jcr-configuration.xml</import>