activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r816280 - in /activemq/branches/activemq-5.3: ./ assembly/src/release/bin/ assembly/src/release/bin/linux-x86-32/ assembly/src/release/bin/linux-x86-64/ assembly/src/release/bin/macosx/ assembly/src/release/bin/win32/ assembly/src/release/c...
Date Thu, 17 Sep 2009 17:07:04 GMT
Author: chirino
Date: Thu Sep 17 17:07:03 2009
New Revision: 816280

URL: http://svn.apache.org/viewvc?rev=816280&view=rev
Log:
Merging logging config changes from trunk

Added:
    activemq/branches/activemq-5.3/assembly/src/release/conf/logging.properties
      - copied unchanged from r816279, activemq/trunk/assembly/src/release/conf/logging.properties
Modified:
    activemq/branches/activemq-5.3/   (props changed)
    activemq/branches/activemq-5.3/assembly/src/release/bin/activemq
    activemq/branches/activemq-5.3/assembly/src/release/bin/activemq.bat
    activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-32/wrapper.conf
    activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-64/wrapper.conf
    activemq/branches/activemq-5.3/assembly/src/release/bin/macosx/wrapper.conf
    activemq/branches/activemq-5.3/assembly/src/release/bin/win32/wrapper.conf
    activemq/branches/activemq-5.3/assembly/src/release/conf/log4j.properties
    activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
  (props changed)
    activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
  (props changed)
    activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
  (props changed)
    activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
  (props changed)
    activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
  (props changed)
    activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
  (props changed)

Propchange: activemq/branches/activemq-5.3/
------------------------------------------------------------------------------
    svn:mergeinfo = /activemq/trunk:816278-816279

Modified: activemq/branches/activemq-5.3/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/bin/activemq?rev=816280&r1=816279&r2=816280&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/bin/activemq (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/bin/activemq Thu Sep 17 17:07:03 2009
@@ -127,7 +127,7 @@
 fi
 
 if [ -z "$ACTIVEMQ_OPTS" ] ; then
-  ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true"
+  ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=${ACTIVEMQ_BASE}/logging.properties"
 fi
 
 if [ -z "$SUNJMX" ] ; then

Modified: activemq/branches/activemq-5.3/assembly/src/release/bin/activemq.bat
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/bin/activemq.bat?rev=816280&r1=816279&r2=816280&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/bin/activemq.bat (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/bin/activemq.bat Thu Sep 17 17:07:03
2009
@@ -71,7 +71,7 @@
 
 if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME%
 
-if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true
+if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true
-Djava.util.logging.config.file=${ACTIVEMQ_BASE}\logging.properties
 
 if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
 REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false

Modified: activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-32/wrapper.conf?rev=816280&r1=816279&r2=816280&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-32/wrapper.conf (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-32/wrapper.conf Thu
Sep 17 17:07:03 2009
@@ -51,7 +51,7 @@
 wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true
+wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 

Modified: activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-64/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-64/wrapper.conf?rev=816280&r1=816279&r2=816280&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-64/wrapper.conf (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/bin/linux-x86-64/wrapper.conf Thu
Sep 17 17:07:03 2009
@@ -51,7 +51,7 @@
 wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true
+wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 

Modified: activemq/branches/activemq-5.3/assembly/src/release/bin/macosx/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/bin/macosx/wrapper.conf?rev=816280&r1=816279&r2=816280&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/bin/macosx/wrapper.conf (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/bin/macosx/wrapper.conf Thu Sep 17
17:07:03 2009
@@ -51,7 +51,7 @@
 wrapper.java.additional.6=-Djavax.net.ssl.trustStore=%ACTIVEMQ_BASE%/conf/broker.ts
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true
+wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties
 
 # Uncomment to enable jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 

Modified: activemq/branches/activemq-5.3/assembly/src/release/bin/win32/wrapper.conf
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/bin/win32/wrapper.conf?rev=816280&r1=816279&r2=816280&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/bin/win32/wrapper.conf (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/bin/win32/wrapper.conf Thu Sep 17
17:07:03 2009
@@ -51,7 +51,7 @@
 wrapper.java.additional.6=-Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
 wrapper.java.additional.7=-Dcom.sun.management.jmxremote
 wrapper.java.additional.8=-Dorg.apache.activemq.UseDedicatedTaskRunner=true
-wrapper.java.additional.9=-Dderby.storage.fileSyncTransactionLog=true
+wrapper.java.additional.9=-Djava.util.logging.config.file=%ACTIVEMQ_BASE%/logging.properties
 
 # Uncomment to enable remote jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616 

Modified: activemq/branches/activemq-5.3/assembly/src/release/conf/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/release/conf/log4j.properties?rev=816280&r1=816279&r2=816280&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/release/conf/log4j.properties (original)
+++ activemq/branches/activemq-5.3/assembly/src/release/conf/log4j.properties Thu Sep 17 17:07:03
2009
@@ -16,36 +16,35 @@
 ## ---------------------------------------------------------------------------
 
 #
-# 
+# This file controls most of the logging in ActiveMQ which is mainly based around 
+# the commons logging API.
 #
-log4j.rootLogger=INFO, stdout, out
+log4j.rootLogger=INFO, console, logfile
 log4j.logger.org.apache.activemq.spring=WARN
 log4j.logger.org.springframework=WARN
-log4j.logger.org.apache.xbean.spring=WARN
+log4j.logger.org.apache.xbean=WARN
+log4j.logger.org.apache.camel=ERROR
 
 # When debugging or reporting problems to the ActiveMQ team,
 # comment out the above lines and uncomment the next.
 
-#log4j.rootLogger=DEBUG, out, stdout
+#log4j.rootLogger=DEBUG, logfile, console
 
 # Or for more fine grained debug logging uncomment one of these
 #log4j.logger.org.apache.activemq=DEBUG
 #log4j.logger.org.apache.camel=DEBUG
 
-
-
-#The logging properties used during tests..
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-5p %-30.30c{1} - %m%n
-#log4j.appender.stdout.threshold=INFO
+# Console appender
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%5p | %m%n
+log4j.appender.console.threshold=INFO
 
 # File appender
-log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.file=${activemq.base}/data/activemq.log
-log4j.appender.out.maxFileSize=1024KB
-log4j.appender.out.maxBackupIndex=5
-log4j.appender.out.append=true
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.logfile=org.apache.log4j.RollingFileAppender
+log4j.appender.logfile.file=${activemq.base}/data/activemq.log
+log4j.appender.logfile.maxFileSize=1024KB
+log4j.appender.logfile.maxBackupIndex=5
+log4j.appender.logfile.append=true
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logfile.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n

Propchange: activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/BytesMarshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/IntegerMarshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/LongMarshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/Marshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/ObjectMarshaller.java
            ('svn:mergeinfo' removed)

Propchange: activemq/branches/activemq-5.3/kahadb/src/main/java/org/apache/kahadb/util/StringMarshaller.java
            ('svn:mergeinfo' removed)



Mime
View raw message