[jboss-cvs] JBossAS SVN: r90007 - in branches/dml-log-service-integration: main/src/resources and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jun 9 17:51:07 EDT 2009


Author: david.lloyd at jboss.com
Date: 2009-06-09 17:51:06 -0400 (Tue, 09 Jun 2009)
New Revision: 90007

Added:
   branches/dml-log-service-integration/main/src/resources/logging.properties
   branches/dml-log-service-integration/system/src/resources/logging.properties
Removed:
   branches/dml-log-service-integration/main/src/resources/log4j-debug.properties
   branches/dml-log-service-integration/main/src/resources/log4j-trace.properties
   branches/dml-log-service-integration/main/src/resources/log4j.properties
   branches/dml-log-service-integration/system/src/resources/jdklogger.xml
   branches/dml-log-service-integration/system/src/resources/log4j-debug.properties
   branches/dml-log-service-integration/system/src/resources/log4j-trace.properties
   branches/dml-log-service-integration/system/src/resources/log4j.properties
Modified:
   branches/dml-log-service-integration/component-matrix/pom.xml
   branches/dml-log-service-integration/thirdparty/pom.xml
Log:
Fix deps, get configuration sorted out

Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/component-matrix/pom.xml	2009-06-09 21:51:06 UTC (rev 90007)
@@ -90,6 +90,7 @@
     <version.org.jboss.threads>1.0.0.GA</version.org.jboss.threads>
     <version.org.jboss.vfs>2.1.0.GA</version.org.jboss.vfs>
     <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
+    <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
     <version.org.jboss.xnio.metadata>1.0.0.GA</version.org.jboss.xnio.metadata>
     <version.org.jboss.xnio>1.2.0.GA</version.org.jboss.xnio>
     <version.org.slf4j>1.5.6</version.org.slf4j>
@@ -1105,6 +1106,12 @@
       </dependency>
       
       <dependency>
+        <groupId>org.jboss.slf4j</groupId>
+        <artifactId>slf4j-jboss-logging</artifactId>
+        <version>${version.org.jboss.slf4j}</version>
+      </dependency>
+      
+      <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
         <version>${version.org.hibernate}</version>

Deleted: branches/dml-log-service-integration/main/src/resources/log4j-debug.properties
===================================================================
--- branches/dml-log-service-integration/main/src/resources/log4j-debug.properties	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/main/src/resources/log4j-debug.properties	2009-06-09 21:51:06 UTC (rev 90007)
@@ -1,22 +0,0 @@
-### ====================================================================== ###
-##                                                                          ##
-##  JBoss Bootstrap Log4j Configuration (DEBUG)                             ##
-##                                                                          ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-log4j.rootCategory=DEBUG, FILE, CONSOLE
-
-### A bootstrap file appender
-log4j.appender.FILE=org.jboss.logging.appender.FileAppender
-log4j.appender.FILE.File=${jboss.server.log.dir}/boot.log
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-log4j.appender.FILE.Append=false
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-

Deleted: branches/dml-log-service-integration/main/src/resources/log4j-trace.properties
===================================================================
--- branches/dml-log-service-integration/main/src/resources/log4j-trace.properties	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/main/src/resources/log4j-trace.properties	2009-06-09 21:51:06 UTC (rev 90007)
@@ -1,22 +0,0 @@
-### ====================================================================== ###
-##                                                                          ##
-##  JBoss Bootstrap Log4j Configuration (TRACE)                             ##
-##                                                                          ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-log4j.rootCategory=TRACE#org.jboss.logging.XLevel, FILE, CONSOLE
-
-### A bootstrap file appender
-log4j.appender.FILE=org.jboss.logging.appender.FileAppender
-log4j.appender.FILE.File=${jboss.server.log.dir}/boot.log
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-log4j.appender.FILE.Append=false
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-

Deleted: branches/dml-log-service-integration/main/src/resources/log4j.properties
===================================================================
--- branches/dml-log-service-integration/main/src/resources/log4j.properties	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/main/src/resources/log4j.properties	2009-06-09 21:51:06 UTC (rev 90007)
@@ -1,24 +0,0 @@
-### ====================================================================== ###
-##                                                                          ##
-##  JBoss Bootstrap Log4j Configuration                                     ##
-##                                                                          ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-log4j.rootCategory=DEBUG, FILE, CONSOLE
-
-### A bootstrap file appender
-log4j.appender.FILE=org.jboss.logging.appender.FileAppender
-log4j.appender.FILE.File=${jboss.server.log.dir}/boot.log
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-log4j.appender.FILE.Append=false
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=INFO
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-
-#log4j.category.org.jboss.deployers=TRACE#org.jboss.logging.XLevel

Added: branches/dml-log-service-integration/main/src/resources/logging.properties
===================================================================
--- branches/dml-log-service-integration/main/src/resources/logging.properties	                        (rev 0)
+++ branches/dml-log-service-integration/main/src/resources/logging.properties	2009-06-09 21:51:06 UTC (rev 90007)
@@ -0,0 +1,50 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# 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.
+#
+
+### $Id: $ ###
+
+# Logger names to configure (root logger is always configured)
+loggers=
+
+# Root logger level
+logger.level=DEBUG
+# Root logger handlers
+logger.handlers=CONSOLE, FILE
+
+# Console handler configuration
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=INFO
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# Boot log file handler configuration
+handler.FILE=org.jboss.logmanager.handlers.FileHandler
+handler.FILE.properties=autoFlush,fileName
+handler.FILE.autoFlush=true
+handler.FILE.fileName=${jboss.boot.server.log.dir}/boot.log
+handler.FILE.formatter=PATTERN
+
+# Formatter pattern configuration
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=patternString
+formatter.PATTERM.patternString=%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n

Deleted: branches/dml-log-service-integration/system/src/resources/jdklogger.xml
===================================================================
--- branches/dml-log-service-integration/system/src/resources/jdklogger.xml	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/system/src/resources/jdklogger.xml	2009-06-09 21:51:06 UTC (rev 90007)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jdk:configuration PUBLIC "urn:jboss:jdklogger.dtd" "jdklogger.dtd">
-
-<jdk:configuration debug="false">
-
-   <!-- ================================= -->
-   <!-- Preserve messages in a local file -->
-   <!-- ================================= -->
-
-   <!-- A time/date based rolling appender -->
-   <appender name="FILE" class="org.jboss.logging.jdk.handlers.FileHandler">
-      <param name="File" value="${jboss.server.log.dir}/boot.log"/>
-      <param name="Append" value="false"/>
-
-      <layout class="org.jboss.logging.jdk.format.PatternFormatter">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ============================== -->
-   <!-- Append messages to the console -->
-   <!-- ============================== -->
-
-   <appender name="CONSOLE" class="java.util.logging.ConsoleHandler">
-      <param name="Level" value="INFO"/>
-
-      <layout class="org.jboss.logging.jdk.format.PatternFormatter">
-         <!-- The default pattern: Date Priority [Category] Message\n -->
-         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
-      </layout>
-   </appender>
-
-   <!-- ======================= -->
-   <!-- Setup the Root category -->
-   <!-- ======================= -->
-
-   <root>
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="FILE"/>
-   </root>
-
-</jdk:configuration>
\ No newline at end of file

Deleted: branches/dml-log-service-integration/system/src/resources/log4j-debug.properties
===================================================================
--- branches/dml-log-service-integration/system/src/resources/log4j-debug.properties	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/system/src/resources/log4j-debug.properties	2009-06-09 21:51:06 UTC (rev 90007)
@@ -1,22 +0,0 @@
-### ====================================================================== ###
-##                                                                          ##
-##  JBoss Bootstrap Log4j Configuration (DEBUG)                             ##
-##                                                                          ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-log4j.rootCategory=DEBUG, FILE, CONSOLE
-
-### A bootstrap file appender
-log4j.appender.FILE=org.jboss.logging.appender.FileAppender
-log4j.appender.FILE.File=${jboss.server.log.dir}/boot.log
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-log4j.appender.FILE.Append=false
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-

Deleted: branches/dml-log-service-integration/system/src/resources/log4j-trace.properties
===================================================================
--- branches/dml-log-service-integration/system/src/resources/log4j-trace.properties	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/system/src/resources/log4j-trace.properties	2009-06-09 21:51:06 UTC (rev 90007)
@@ -1,22 +0,0 @@
-### ====================================================================== ###
-##                                                                          ##
-##  JBoss Bootstrap Log4j Configuration (TRACE)                             ##
-##                                                                          ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-log4j.rootCategory=TRACE#org.jboss.logging.XLevel, FILE, CONSOLE
-
-### A bootstrap file appender
-log4j.appender.FILE=org.jboss.logging.appender.FileAppender
-log4j.appender.FILE.File=${jboss.server.log.dir}/boot.log
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-log4j.appender.FILE.Append=false
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-

Deleted: branches/dml-log-service-integration/system/src/resources/log4j.properties
===================================================================
--- branches/dml-log-service-integration/system/src/resources/log4j.properties	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/system/src/resources/log4j.properties	2009-06-09 21:51:06 UTC (rev 90007)
@@ -1,24 +0,0 @@
-### ====================================================================== ###
-##                                                                          ##
-##  JBoss Bootstrap Log4j Configuration                                     ##
-##                                                                          ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-log4j.rootCategory=DEBUG, FILE, CONSOLE
-
-### A bootstrap file appender
-log4j.appender.FILE=org.jboss.logging.appender.FileAppender
-log4j.appender.FILE.File=${jboss.server.log.dir}/boot.log
-log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-log4j.appender.FILE.Append=false
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=INFO
-log4j.appender.CONSOLE.Target=System.out
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
-
-#log4j.category.org.jboss.deployers=TRACE#org.jboss.logging.XLevel

Added: branches/dml-log-service-integration/system/src/resources/logging.properties
===================================================================
--- branches/dml-log-service-integration/system/src/resources/logging.properties	                        (rev 0)
+++ branches/dml-log-service-integration/system/src/resources/logging.properties	2009-06-09 21:51:06 UTC (rev 90007)
@@ -0,0 +1,50 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# 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.
+#
+
+### $Id: $ ###
+
+# Logger names to configure (root logger is always configured)
+loggers=
+
+# Root logger level
+logger.level=DEBUG
+# Root logger handlers
+logger.handlers=CONSOLE, FILE
+
+# Console handler configuration
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=INFO
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# Boot log file handler configuration
+handler.FILE=org.jboss.logmanager.handlers.FileHandler
+handler.FILE.properties=autoFlush,fileName
+handler.FILE.autoFlush=true
+handler.FILE.fileName=${jboss.boot.server.log.dir}/boot.log
+handler.FILE.formatter=PATTERN
+
+# Formatter pattern configuration
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=patternString
+formatter.PATTERM.patternString=%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n

Modified: branches/dml-log-service-integration/thirdparty/pom.xml
===================================================================
--- branches/dml-log-service-integration/thirdparty/pom.xml	2009-06-09 21:26:02 UTC (rev 90006)
+++ branches/dml-log-service-integration/thirdparty/pom.xml	2009-06-09 21:51:06 UTC (rev 90007)
@@ -1258,6 +1258,10 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.slf4j</groupId>
+      <artifactId>slf4j-jboss-logging</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
     </dependency>




More information about the jboss-cvs-commits mailing list