You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/01/13 14:29:11 UTC

svn commit: r898746 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/management/ camel-core/src/main/java/org/apache/camel/spi/ camel-core/src/main/java/org/apache/camel/util/ camel-core/src/test/java/org/apache/camel/management/ components...

Author: davsclaus
Date: Wed Jan 13 13:29:11 2010
New Revision: 898746

URL: http://svn.apache.org/viewvc?rev=898746&view=rev
Log:
CAMEL-2355: You can now have multiple EventNotifier instead of only one.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java
      - copied, changed from r898681, camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java
      - copied, changed from r898681, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
    camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml
      - copied, changed from r898681, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailreHandledEventsTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java
    camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java Wed Jan 13 13:29:11 2010
@@ -289,7 +289,7 @@
             }
         }
 
-        // register bean if by force or not exsists
+        // register bean if by force or not exists
         ObjectInstance instance = null;
         if (forceRegistration || !exists) {
             if (LOG.isTraceEnabled()) {
@@ -312,8 +312,7 @@
         String hostName;
         boolean canAccessSystemProps = true;
         try {
-            // we'll do it this way mostly to determine if we should lookup the
-            // hostName
+            // we'll do it this way mostly to determine if we should lookup the hostName
             SecurityManager sm = System.getSecurityManager();
             if (sm != null) {
                 sm.checkPropertiesAccess();

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementStrategy.java Wed Jan 13 13:29:11 2010
@@ -16,9 +16,10 @@
  */
 package org.apache.camel.management;
 
+import java.util.ArrayList;
 import java.util.EventObject;
+import java.util.List;
 
-import org.apache.camel.CamelContextAware;
 import org.apache.camel.ManagementStatisticsLevel;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.spi.EventFactory;
@@ -44,19 +45,23 @@
  */
 public class DefaultManagementStrategy implements ManagementStrategy {
 
-    private EventNotifier eventNotifier;
+    private List<EventNotifier> eventNotifiers = new ArrayList<EventNotifier>();
     private EventFactory eventFactory = new DefaultEventFactory();
     private ManagementNamingStrategy managementNamingStrategy;
     private boolean onlyManageProcessorWithCustomId;
     private ManagementAgent managementAgent;
     private ManagementStatisticsLevel statisticsLevel = ManagementStatisticsLevel.All;
 
-    public EventNotifier getEventNotifier() {
-        return eventNotifier;
+    public List<EventNotifier> getEventNotifiers() {
+        return eventNotifiers;
     }
 
-    public void setEventNotifier(EventNotifier eventNotifier) {
-        this.eventNotifier = eventNotifier;
+    public void addEventNotifier(EventNotifier eventNotifier) {
+        this.eventNotifiers.add(eventNotifier);
+    }
+
+    public void setEventNotifiers(List<EventNotifier> eventNotifiers) {
+        this.eventNotifiers = eventNotifiers;
     }
 
     public EventFactory getEventFactory() {
@@ -125,8 +130,12 @@
     }
 
     public void notify(EventObject event) throws Exception {
-        if (eventNotifier != null && eventNotifier.isEnabled(event)) {
-            eventNotifier.notify(event);
+        if (eventNotifiers != null && !eventNotifiers.isEmpty()) {
+            for (EventNotifier notifier : eventNotifiers) {
+                if (notifier.isEnabled(event)) {
+                    notifier.notify(event);
+                }
+            }
         }
     }
 
@@ -135,7 +144,7 @@
         return null;
     }
 
-    public void setSatisticsLevel(ManagementStatisticsLevel level) {
+    public void setStatisticsLevel(ManagementStatisticsLevel level) {
         this.statisticsLevel = level;
     }
 
@@ -144,8 +153,8 @@
     }
 
     public void start() throws Exception {
-        if (eventNotifier != null) {
-            ServiceHelper.startService(eventNotifier);
+        if (eventNotifiers != null) {
+            ServiceHelper.startServices(eventNotifiers);
         }
         if (managementAgent != null) {
             managementAgent.start();
@@ -160,8 +169,8 @@
         if (managementAgent != null) {
             managementAgent.stop();
         }
-        if (eventNotifier != null) {
-            ServiceHelper.stopService(eventNotifier);
+        if (eventNotifiers != null) {
+            ServiceHelper.stopServices(eventNotifiers);
         }
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementStrategy.java Wed Jan 13 13:29:11 2010
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.spi;
 
+import java.util.List;
+
 import org.apache.camel.ManagementStatisticsLevel;
 import org.apache.camel.Service;
 import org.apache.camel.model.ProcessorDefinition;
@@ -34,18 +36,25 @@
 public interface ManagementStrategy extends org.fusesource.commons.management.ManagementStrategy, Service {
 
     /**
-     * Gets the event notifier.
+     * Gets the event notifiers.
+     *
+     * @return event notifiers
+     */
+    List<EventNotifier> getEventNotifiers();
+
+    /**
+     * Sets the list of event notifier to use.
      *
-     * @return event notifier
+     * @param eventNotifier list of event notifiers
      */
-    EventNotifier getEventNotifier();
+    void setEventNotifiers(List<EventNotifier> eventNotifier);
 
     /**
-     * Sets the event notifier to use.
+     * Adds the event notifier to use.
      *
      * @param eventNotifier event notifier
      */
-    void setEventNotifier(EventNotifier eventNotifier);
+    void addEventNotifier(EventNotifier eventNotifier);
 
     /**
      * Gets the event factory
@@ -122,7 +131,7 @@
      *
      * @param level the new level
      */
-    void setSatisticsLevel(ManagementStatisticsLevel level);
+    void setStatisticsLevel(ManagementStatisticsLevel level);
 
     /**
      * Gets the statistics level

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.java Wed Jan 13 13:29:11 2010
@@ -17,6 +17,7 @@
 package org.apache.camel.util;
 
 import java.util.EventObject;
+import java.util.List;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
@@ -41,228 +42,326 @@
     }
 
     public static void notifyCamelContextStarting(CamelContext context) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreCamelContextEvents()) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
-            return;
-        }
-        EventObject event = factory.createCamelContextStartingEvent(context);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreCamelContextEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createCamelContextStartingEvent(context);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyCamelContextStarted(CamelContext context) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreCamelContextEvents()) {
-            return;
-        }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventObject event = factory.createCamelContextStartedEvent(context);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreCamelContextEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createCamelContextStartedEvent(context);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyCamelContextStartupFailed(CamelContext context, Exception cause) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreCamelContextEvents()) {
-            return;
-        }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventObject event = factory.createCamelContextStartupFailureEvent(context, cause);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreCamelContextEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createCamelContextStartupFailureEvent(context, cause);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyCamelContextStopping(CamelContext context) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreCamelContextEvents()) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
-            return;
-        }
-        EventObject event = factory.createCamelContextStoppingEvent(context);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreCamelContextEvents()) {
+                return;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createCamelContextStoppingEvent(context);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyCamelContextStopped(CamelContext context) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreCamelContextEvents()) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
-            return;
-        }
-        EventObject event = factory.createCamelContextStoppedEvent(context);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreCamelContextEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createCamelContextStoppedEvent(context);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyCamelContextStopFailed(CamelContext context, Exception cause) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreCamelContextEvents()) {
-            return;
-        }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventObject event = factory.createCamelContextStopFailureEvent(context, cause);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreCamelContextEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createCamelContextStopFailureEvent(context, cause);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyServiceStopFailure(CamelContext context, Object service, Exception cause) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreServiceEvents()) {
-            return;
-        }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventObject event = factory.createServiceStopFailureEvent(context, service, cause);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreServiceEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createServiceStopFailureEvent(context, service, cause);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyServiceStartupFailure(CamelContext context, Object service, Exception cause) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreServiceEvents()) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
-            return;
-        }
-        EventObject event = factory.createServiceStartupFailureEvent(context, service, cause);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreServiceEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createServiceStartupFailureEvent(context, service, cause);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyRouteStarted(CamelContext context, Route route) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreRouteEvents()) {
-            return;
-        }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventObject event = factory.createRouteStartedEvent(route);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreRouteEvents()) {
+                return;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createRouteStartedEvent(route);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyRouteStopped(CamelContext context, Route route) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreRouteEvents()) {
-            return;
-        }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventObject event = factory.createRouteStoppedEvent(route);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreRouteEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createRouteStoppedEvent(route);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyExchangeCreated(CamelContext context, Exchange exchange) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeCreatedEvent()) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
-            return;
-        }
-        EventObject event = factory.createExchangeCreatedEvent(exchange);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeCreatedEvent()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createExchangeCreatedEvent(exchange);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyExchangeDone(CamelContext context, Exchange exchange) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeCompletedEvent()) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
-            return;
-        }
-        EventObject event = factory.createExchangeCompletedEvent(exchange);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeCompletedEvent()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createExchangeCompletedEvent(exchange);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyExchangeFailed(CamelContext context, Exchange exchange) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeFailureEvents()) {
-            return;
-        }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventObject event = factory.createExchangeFailureEvent(exchange);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeFailureEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createExchangeFailureEvent(exchange);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     public static void notifyExchangeFailureHandled(CamelContext context, Exchange exchange, Processor failureHandler,
                                                     boolean deadLetterChannel) {
-        EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
-        if (notifier == null || notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeFailureEvents()) {
-            return;
-        }
-        EventFactory factory = context.getManagementStrategy().getEventFactory();
-        if (factory == null) {
+        List<EventNotifier> notifiers = context.getManagementStrategy().getEventNotifiers();
+        if (notifiers == null || notifiers.isEmpty()) {
             return;
         }
-        EventObject event = factory.createExchangeFailureHandledEvent(exchange, failureHandler, deadLetterChannel);
-        if (event == null) {
-            return;
+
+        for (EventNotifier notifier : notifiers) {
+            if (notifier.isIgnoreExchangeEvents() || notifier.isIgnoreExchangeFailureEvents()) {
+                continue;
+            }
+
+            EventFactory factory = context.getManagementStrategy().getEventFactory();
+            if (factory == null) {
+                return;
+            }
+            EventObject event = factory.createExchangeFailureHandledEvent(exchange, failureHandler, deadLetterChannel);
+            if (event == null) {
+                return;
+            }
+            doNotifyEvent(notifier, event);
         }
-        doNotifyEvent(notifier, event);
     }
 
     private static void doNotifyEvent(EventNotifier notifier, EventObject event) {

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java Wed Jan 13 13:29:11 2010
@@ -50,7 +50,7 @@
     @Override
     protected CamelContext createCamelContext() throws Exception {
         DefaultCamelContext context = new DefaultCamelContext(createRegistry());
-        context.getManagementStrategy().setEventNotifier(new EventNotifierSupport() {
+        context.getManagementStrategy().addEventNotifier(new EventNotifierSupport() {
             public void notify(EventObject event) throws Exception {
                 events.add(event);
             }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailreHandledEventsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailreHandledEventsTest.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailreHandledEventsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailreHandledEventsTest.java Wed Jan 13 13:29:11 2010
@@ -53,7 +53,7 @@
     @Override
     protected CamelContext createCamelContext() throws Exception {
         DefaultCamelContext context = new DefaultCamelContext(createRegistry());
-        context.getManagementStrategy().setEventNotifier(new EventNotifierSupport() {
+        context.getManagementStrategy().addEventNotifier(new EventNotifierSupport() {
             public void notify(EventObject event) throws Exception {
                 events.add(event);
             }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java Wed Jan 13 13:29:11 2010
@@ -50,7 +50,7 @@
         context.addService(new MyService("B", true));
         context.addService(new MyService("C", false));
 
-        context.getManagementStrategy().setEventNotifier(new EventNotifierSupport() {
+        context.getManagementStrategy().addEventNotifier(new EventNotifierSupport() {
             public void notify(EventObject event) throws Exception {
                 events.add(event);
             }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java Wed Jan 13 13:29:11 2010
@@ -35,7 +35,7 @@
         notifier.setIgnoreServiceEvents(true);
 
         CamelContext context = new DefaultCamelContext(createRegistry());
-        context.getManagementStrategy().setEventNotifier(notifier);
+        context.getManagementStrategy().addEventNotifier(notifier);
 
         return context;
     }

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java Wed Jan 13 13:29:11 2010
@@ -39,7 +39,7 @@
         naming.setDomainName("org.apache.camel");
 
         // disable it by default
-        context.getManagementStrategy().setSatisticsLevel(ManagementStatisticsLevel.Off);
+        context.getManagementStrategy().setStatisticsLevel(ManagementStatisticsLevel.Off);
         return context;
     }
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java Wed Jan 13 13:29:11 2010
@@ -38,7 +38,7 @@
         naming.setDomainName("org.apache.camel");
 
         // only routes
-        context.getManagementStrategy().setSatisticsLevel(ManagementStatisticsLevel.RoutesOnly);
+        context.getManagementStrategy().setStatisticsLevel(ManagementStatisticsLevel.RoutesOnly);
         return context;
     }
 

Copied: camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java (from r898681, camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java&r1=898681&r2=898746&rev=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java Wed Jan 13 13:29:11 2010
@@ -37,20 +37,22 @@
 /**
  * @version $Revision$
  */
-public class EventNotifierEventsTest extends ContextTestSupport {
+public class MultipleEventNotifierEventsTest extends ContextTestSupport {
 
     private static List<EventObject> events = new ArrayList<EventObject>();
+    private static List<EventObject> events2 = new ArrayList<EventObject>();
 
     @Override
     public void setUp() throws Exception {
         events.clear();
+        events2.clear();
         super.setUp();
     }
 
     @Override
     protected CamelContext createCamelContext() throws Exception {
         DefaultCamelContext context = new DefaultCamelContext(createRegistry());
-        context.getManagementStrategy().setEventNotifier(new EventNotifierSupport() {
+        context.getManagementStrategy().addEventNotifier(new EventNotifierSupport() {
             public void notify(EventObject event) throws Exception {
                 events.add(event);
             }
@@ -67,6 +69,26 @@
             protected void doStop() throws Exception {
             }
         });
+        context.getManagementStrategy().addEventNotifier(new EventNotifierSupport() {
+            public void notify(EventObject event) throws Exception {
+                events2.add(event);
+            }
+
+            public boolean isEnabled(EventObject event) {
+                return true;
+            }
+
+            @Override
+            protected void doStart() throws Exception {
+                setIgnoreCamelContextEvents(true);
+                setIgnoreServiceEvents(true);
+                setIgnoreRouteEvents(true);
+            }
+
+            @Override
+            protected void doStop() throws Exception {
+            }
+        });
         return context;
     }
 
@@ -85,6 +107,10 @@
         assertIsInstanceOf(ExchangeCreatedEvent.class, events.get(4));
         assertIsInstanceOf(ExchangeCompletedEvent.class, events.get(5));
 
+        assertEquals(2, events2.size());
+        assertIsInstanceOf(ExchangeCreatedEvent.class, events2.get(0));
+        assertIsInstanceOf(ExchangeCompletedEvent.class, events2.get(1));
+
         context.stop();
 
         assertEquals(10, events.size());
@@ -92,6 +118,8 @@
         assertIsInstanceOf(RouteStoppedEvent.class, events.get(7));
         assertIsInstanceOf(RouteStoppedEvent.class, events.get(8));
         assertIsInstanceOf(CamelContextStoppedEvent.class, events.get(9));
+
+        assertEquals(2, events2.size());
     }
 
     public void testExchangeFailed() throws Exception {
@@ -111,13 +139,19 @@
         assertIsInstanceOf(ExchangeCreatedEvent.class, events.get(4));
         assertIsInstanceOf(ExchangeFailureEvent.class, events.get(5));
 
+        assertEquals(2, events2.size());
+
         context.stop();
+        assertIsInstanceOf(ExchangeCreatedEvent.class, events2.get(0));
+        assertIsInstanceOf(ExchangeFailureEvent.class, events2.get(1));
 
         assertEquals(10, events.size());
         assertIsInstanceOf(CamelContextStoppingEvent.class, events.get(6));
         assertIsInstanceOf(RouteStoppedEvent.class, events.get(7));
         assertIsInstanceOf(RouteStoppedEvent.class, events.get(8));
         assertIsInstanceOf(CamelContextStoppedEvent.class, events.get(9));
+
+        assertEquals(2, events2.size());
     }
 
     @Override
@@ -132,4 +166,4 @@
         };
     }
 
-}
+}
\ No newline at end of file

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java Wed Jan 13 13:29:11 2010
@@ -34,7 +34,7 @@
         notifier.setCamelContext(context);
         notifier.setEndpointUri("mock:event");
 
-        context.getManagementStrategy().setEventNotifier(notifier);
+        context.getManagementStrategy().addEventNotifier(notifier);
 
         return context;
     }

Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java Wed Jan 13 13:29:11 2010
@@ -285,7 +285,7 @@
     }
 
     /**
-     * @deprecated will be removed in Camel 2.2
+     * @deprecated will be removed in the future
      */
     @Deprecated
     public static class CamelJmsTemplate102 extends JmsTemplate102 {
@@ -381,7 +381,7 @@
 
                 int priority = message.getJMSPriority();
                 if (priority <= 0) {
-                    // use prioriry from endpoint if not provided on message
+                    // use priority from endpoint if not provided on message
                     priority = this.getPriority();
                 }
 
@@ -392,7 +392,7 @@
                 int deliveryMode;
                 if (JmsMessageHelper.hasProperty(message, JmsConstants.JMS_DELIVERY_MODE)) {
                     deliveryMode = message.getIntProperty(JmsConstants.JMS_DELIVERY_MODE);
-                    // remove the temporary propery
+                    // remove the temporary property
                     JmsMessageHelper.removeJmsProperty(message, JmsConstants.JMS_DELIVERY_MODE);
                 } else {
                     deliveryMode = this.getDeliveryMode();
@@ -571,7 +571,7 @@
     }
 
     /**
-     * @deprecated will be removed in Camel 2.2
+     * @deprecated will be removed in the future
      */
     @Deprecated
     public boolean isUseVersion102() {
@@ -579,7 +579,7 @@
     }
 
     /**
-     * @deprecated will be removed in Camel 2.2
+     * @deprecated will be removed in the future
      */
     @Deprecated
     public void setUseVersion102(boolean useVersion102) {
@@ -1271,8 +1271,8 @@
     public void setReplyToDestinationSelectorName(String replyToDestinationSelectorName) {
         this.replyToDestinationSelectorName = replyToDestinationSelectorName;
         // in case of consumer -> producer and a named replyTo correlation selector
-        // message passthough is impossible as we need to set the value of selector into
-        // outgoing message, which would be read-only if passthough were to remain enabled
+        // message pass through is impossible as we need to set the value of selector into
+        // outgoing message, which would be read-only if pass through were to remain enabled
         if (replyToDestinationSelectorName != null) {
             setAlwaysCopyMessage(true);
         }

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=898746&r1=898745&r2=898746&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Wed Jan 13 13:29:11 2010
@@ -253,10 +253,17 @@
             getContext().getManagementStrategy().setEventFactory(eventFactory);
         }
 
-        EventNotifier eventNotifier = getBeanForType(EventNotifier.class);
-        if (eventNotifier != null) {
-            LOG.info("Using custom EventNotifier: " + eventNotifier);
-            getContext().getManagementStrategy().setEventNotifier(eventNotifier);
+        // set the event notifier strategies if defined
+        Map<String, EventNotifier> eventNotifiers = getContext().getRegistry().lookupByType(EventNotifier.class);
+        if (eventNotifiers != null && !eventNotifiers.isEmpty()) {
+            for (String id : eventNotifiers.keySet()) {
+                EventNotifier notifier = eventNotifiers.get(id);
+                // do not add if already added, for instance a tracer that is also an InterceptStrategy class
+                if (!getContext().getManagementStrategy().getEventNotifiers().contains(notifier)) {
+                    LOG.info("Using custom EventNotifier with id: " + id + " and implementation: " + notifier);
+                    getContext().getManagementStrategy().addEventNotifier(notifier);
+                }
+            }
         }
 
         ShutdownStrategy shutdownStrategy = getBeanForType(ShutdownStrategy.class);
@@ -272,7 +279,7 @@
                 InterceptStrategy strategy = interceptStrategies.get(id);
                 // do not add if already added, for instance a tracer that is also an InterceptStrategy class
                 if (!getContext().getInterceptStrategies().contains(strategy)) {
-                    LOG.info("Using custom intercept strategy with id: " + id + " and implementation: " + strategy);
+                    LOG.info("Using custom InterceptStrategy with id: " + id + " and implementation: " + strategy);
                     getContext().addInterceptStrategy(strategy);
                 }
             }
@@ -285,7 +292,7 @@
                 LifecycleStrategy strategy = lifecycleStrategies.get(id);
                 // do not add if already added, for instance a tracer that is also an InterceptStrategy class
                 if (!getContext().getLifecycleStrategies().contains(strategy)) {
-                    LOG.info("Using custom lifecycle strategy with id: " + id + " and implementation: " + strategy);
+                    LOG.info("Using custom LifecycleStrategy with id: " + id + " and implementation: " + strategy);
                     getContext().addLifecycleStrategy(strategy);
                 }
             }
@@ -553,7 +560,7 @@
             getContext().addLifecycleStrategy(new DefaultManagementLifecycleStrategy(getContext()));
             // set additional configuration from camelJMXAgent
             getContext().getManagementStrategy().onlyManageProcessorWithCustomId(camelJMXAgent.getOnlyRegisterProcessorWithCustomId());
-            getContext().getManagementStrategy().setSatisticsLevel(camelJMXAgent.getStatisticsLevel());
+            getContext().getManagementStrategy().setStatisticsLevel(camelJMXAgent.getStatisticsLevel());
         }
     }
 

Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java (from r898681, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java&r1=898681&r2=898746&rev=898746&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.java Wed Jan 13 13:29:11 2010
@@ -24,10 +24,10 @@
 /**
  * @version $Revision$
  */
-public class SpringLoggingEventNotifierTest extends LoggingEventNotifierTest {
+public class SpringDualLoggingEventNotifierTest extends LoggingEventNotifierTest {
 
     protected CamelContext createCamelContext() throws Exception {
-        return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml");
+        return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml");
     }
 
 }
\ No newline at end of file

Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml (from r898681, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml&r1=898681&r2=898746&rev=898746&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringDualLoggingEventNotifierTest.xml Wed Jan 13 13:29:11 2010
@@ -33,6 +33,10 @@
         <property name="ignoreServiceEvents" value="true"/>
     </bean>
 
+    <bean id="otherLogger" class="org.apache.camel.management.LoggingEventNotifier">
+        <property name="logName" value="org.apache.camel.OtherEventLog"/>
+    </bean>
+
     <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
         <route>
             <from uri="direct:start"/>