tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r563745 - in /openejb/trunk/openejb3/container/openejb-core: pom.xml src/main/java/org/apache/openejb/util/Logger.java src/main/resources/default.logging.conf src/main/resources/embedded.logging.properties
Date Wed, 08 Aug 2007 05:01:28 GMT
Author: dblevins
Date: Tue Aug  7 22:01:27 2007
New Revision: 563745

URL: http://svn.apache.org/viewvc?view=rev&rev=563745
Log:
Patch from Karan Malhi OPENEJB-626:Rename default.logging.conf to embedded.logging.properties
and also change appenders for embedded.logging.properties
Thanks Karan!

Added:
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf
    openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties
  (contents, props changed)
      - copied, changed from r562831, openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf
Modified:
    openejb/trunk/openejb3/container/openejb-core/pom.xml
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java

Modified: openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=563745&r1=563744&r2=563745
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ openejb/trunk/openejb3/container/openejb-core/pom.xml Tue Aug  7 22:01:27 2007
@@ -79,7 +79,7 @@
             </property>
             <property>
               <name>log4j.configuration</name>
-              <value>file:///${basedir}/target/classes/default.logging.conf</value>
+              <value>file:///${basedir}/target/classes/embedded.logging.properties</value>
             </property>
           </systemProperties>
           <!--

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?view=diff&rev=563745&r1=563744&r2=563745
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
Tue Aug  7 22:01:27 2007
@@ -515,7 +515,7 @@
                 String configData = null;
                 try {
                     ResourceFinder finder = new ResourceFinder("");
-                    configData = finder.findString("default.logging.conf");
+                    configData = finder.findString("embedded.logging.properties");
                     properties = new Properties();
                     properties.load(new ByteArrayInputStream(configData
                             .getBytes()));

Added: openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf?view=auto&rev=563745
==============================================================================
    (empty)

Copied: openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties
(from r562831, openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties?view=diff&rev=563745&p1=openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf&r1=562831&p2=openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties&r2=563745
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.logging.conf
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties
Tue Aug  7 22:01:27 2007
@@ -47,39 +47,15 @@
 #
 # =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~
 
-
-log4j.category.OpenEJB             = warn, R
-log4j.category.OpenEJB.server      = info, R
-log4j.category.OpenEJB.startup     = debug,C
-log4j.category.CORBA-Adapter       = debug, R
-log4j.category.Transaction         = warn, TX
-log4j.category.org.apache.activemq = error, R
-log4j.category.org.apache.geronimo = error, R
-log4j.category.openjpa             = error, R
-
-log4j.appender.R                          = org.apache.log4j.RollingFileAppender
-log4j.appender.R.File                     = logs/openejb.log
-log4j.appender.R.MaxFileSize              = 1000KB
-log4j.appender.R.MaxBackupIndex           = 7
-log4j.appender.R.layout                   = org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern = %d - %-5p - %m%n
-
-log4j.appender.TX                          = org.apache.log4j.RollingFileAppender
-log4j.appender.TX.File                     = logs/transaction.log
-log4j.appender.TX.MaxFileSize              = 1000KB
-log4j.appender.TX.MaxBackupIndex           = 100
-log4j.appender.TX.layout                   = org.apache.log4j.PatternLayout
-log4j.appender.TX.layout.ConversionPattern = %p %t %c - %m%n
+log4j.rootLogger                   = fatal,C
+log4j.category.OpenEJB             = warn
+log4j.category.OpenEJB.server      = info
+log4j.category.OpenEJB.startup     = debug
+log4j.category.CORBA-Adapter       = debug
+log4j.category.Transaction         = warn
+log4j.category.org.apache.activemq = error
+log4j.category.org.apache.geronimo = error
+log4j.category.openjpa             = error
 
 log4j.appender.C                           = org.apache.log4j.ConsoleAppender
 log4j.appender.C.layout                    = org.apache.log4j.SimpleLayout
-
-
-log4j.additivity.OpenEJB=false
-log4j.additivity.OpenEJB.server=false
-log4j.additivity.OpenEJB.startup=false
-log4j.additivity.CORBA-Adapter=false
-log4j.additivity.Transaction=false
-log4j.additivity.org.apache.activemq=false
-log4j.additivity.org.apache.geronimo=false
-log4j.additivity.openjpa=false

Propchange: openejb/trunk/openejb3/container/openejb-core/src/main/resources/embedded.logging.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author Id Revision HeadURL



Mime
View raw message