activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r427613 - in /incubator/activemq/trunk: activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java activemq-core/src/main/resources/META-INF/spring.handlers pom.xml
Date Tue, 01 Aug 2006 15:30:46 GMT
Author: chirino
Date: Tue Aug  1 08:30:46 2006
New Revision: 427613

URL: http://svn.apache.org/viewvc?rev=427613&view=rev
Log:
This allow spring 2.0 to work with xbean-2.5

Added:
    incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/spring.handlers
      - copied unchanged from r427610, incubator/activemq/branches/activemq-4.0.2/activemq-core/src/main/resources/META-INF/spring.handlers
Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
    incubator/activemq/trunk/pom.xml

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java?rev=427613&r1=427612&r2=427613&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
(original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
Tue Aug  1 08:30:46 2006
@@ -34,13 +34,10 @@
 public class LoggingBrokerPlugin extends BrokerPluginSupport {
 
     private Log log = LogFactory.getLog(LoggingBrokerPlugin.class);
-    private Log sendLog;
-    private Log ackLog;
+    private Log sendLog = LogFactory.getLog(LoggingBrokerPlugin.class.getName()+".Send");
+    private Log ackLog = LogFactory.getLog(LoggingBrokerPlugin.class.getName()+".Ack");
 
     public void send(ConnectionContext context, Message messageSend) throws Exception {
-        if (sendLog == null) {
-            sendLog = createLog("Send");
-        }
         if (sendLog.isInfoEnabled()) {
             sendLog.info("Sending: " + messageSend);
         }
@@ -48,9 +45,6 @@
     }
 
     public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception {
-        if (ackLog == null) {
-            ackLog = createLog("Ack");
-        }
         if (ackLog.isInfoEnabled()) {
             ackLog.info("Acknowledge: " + ack);
         }
@@ -81,16 +75,6 @@
 
     public void setSendLog(Log sendLog) {
         this.sendLog = sendLog;
-    }
-
-    // Implementation methods
-    // -------------------------------------------------------------------------
-
-    /**
-     * Lazily creates a new child log
-     */
-    protected Log createLog(String name) {
-        return LogFactory.getLog(log.toString() + "." + name);
     }
 
 }

Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/pom.xml?rev=427613&r1=427612&r2=427613&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Tue Aug  1 08:30:46 2006
@@ -131,6 +131,8 @@
         <module>activemq-web-console</module>
         <module>activemq-optional</module>
         <module>maven-bundle-plugin</module>
+        <module>maven-gram-plugin</module>
+        <module>activemq-openwire-generator</module>
         <module>assembly</module>
         <module>activeio</module>
         <!--module>activemq-systest</module -->
@@ -943,6 +945,6 @@
         <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
         <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
         <xstream-version>1.1.2</xstream-version>
-        <xbean-version>2.5</xbean-version>
+        <xbean-version>2.6-SNAPSHOT</xbean-version>
     </properties>
 </project>



Mime
View raw message