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 2009/09/10 18:29:51 UTC
svn commit: r813496 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/impl/ main/java/org/apache/camel/management/
main/java/org/apache/camel/management/event/
main/java/org/apache/camel/spi/ main/java/org/apache/camel/util/
test/java/org/ap...
Author: davsclaus
Date: Thu Sep 10 16:29:48 2009
New Revision: 813496
URL: http://svn.apache.org/viewvc?rev=813496&view=rev
Log:
More class renames to better names.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java (contents, props changed)
- copied, changed from r813447, camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java (with props)
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureEvent.java (contents, props changed)
- copied, changed from r813351, camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java (with props)
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java (contents, props changed)
- copied, changed from r813351, camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStoppingFailedEvent.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStoppingFailedEvent.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.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/EventNotifierServiceStoppingFailedEventTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=813496&r1=813495&r2=813496&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Thu Sep 10 16:29:48 2009
@@ -969,7 +969,7 @@
} catch (Exception e) {
LOG.warn("Error occurred while stopping service: " + service + ". This exception will be ignored.");
// fire event
- EventHelper.notifyServiceStoppingFailed(this, service, e);
+ EventHelper.notifyServiceStopFailure(this, service, e);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java?rev=813496&r1=813495&r2=813496&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.java Thu Sep 10 16:29:48 2009
@@ -24,16 +24,18 @@
import org.apache.camel.Route;
import org.apache.camel.management.event.CamelContextStartedEvent;
import org.apache.camel.management.event.CamelContextStartingEvent;
-import org.apache.camel.management.event.CamelContextStartupFailedEvent;
+import org.apache.camel.management.event.CamelContextStartupFailureEvent;
+import org.apache.camel.management.event.CamelContextStopFailureEvent;
import org.apache.camel.management.event.CamelContextStoppedEvent;
import org.apache.camel.management.event.CamelContextStoppingEvent;
import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.management.event.ExchangeCreatedEvent;
-import org.apache.camel.management.event.ExchangeFailedEvent;
+import org.apache.camel.management.event.ExchangeFailureEvent;
import org.apache.camel.management.event.ExchangeFailureHandledEvent;
import org.apache.camel.management.event.RouteStartedEvent;
import org.apache.camel.management.event.RouteStoppedEvent;
-import org.apache.camel.management.event.ServiceStoppingFailedEvent;
+import org.apache.camel.management.event.ServiceStartupFailureEvent;
+import org.apache.camel.management.event.ServiceStopFailureEvent;
import org.apache.camel.spi.EventFactory;
/**
@@ -57,12 +59,20 @@
return new CamelContextStoppedEvent(context);
}
- public EventObject createCamelContextStartupFailedEvent(CamelContext context, Exception cause) {
- return new CamelContextStartupFailedEvent(context, cause);
+ public EventObject createCamelContextStartupFailureEvent(CamelContext context, Exception cause) {
+ return new CamelContextStartupFailureEvent(context, cause);
}
- public EventObject createServiceStoppingFailedEvent(CamelContext context, Object service, Exception cause) {
- return new ServiceStoppingFailedEvent(context, service, cause);
+ public EventObject createCamelContextStopFailureEvent(CamelContext context, Exception cause) {
+ return new CamelContextStopFailureEvent(context, cause);
+ }
+
+ public EventObject createServiceStartupFailureEvent(CamelContext context, Object service, Exception cause) {
+ return new ServiceStartupFailureEvent(context, service, cause);
+ }
+
+ public EventObject createServiceStopFailureEvent(CamelContext context, Object service, Exception cause) {
+ return new ServiceStopFailureEvent(context, service, cause);
}
public EventObject createRouteStartedEvent(Route route) {
@@ -82,7 +92,7 @@
}
public EventObject createExchangeFailedEvent(Exchange exchange) {
- return new ExchangeFailedEvent(exchange);
+ return new ExchangeFailureEvent(exchange);
}
public EventObject createExchangeFailureHandledEvent(Exchange exchange, Processor failureHandler, boolean deadLetterChannel) {
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java (from r813447, camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java&r1=813447&r2=813496&rev=813496&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java Thu Sep 10 16:29:48 2009
@@ -23,12 +23,12 @@
/**
* @version $Revision$
*/
-public class CamelContextStartupFailedEvent extends EventObject {
+public class CamelContextStartupFailureEvent extends EventObject {
private CamelContext context;
private Exception cause;
- public CamelContextStartupFailedEvent(CamelContext context, Exception cause) {
+ public CamelContextStartupFailureEvent(CamelContext context, Exception cause) {
super(context);
this.context = context;
this.cause = cause;
@@ -44,7 +44,7 @@
@Override
public String toString() {
- return "Starting CamelContext: " + context.getName() + " failed due to " + cause.getMessage();
+ return "Failed to start Camel: " + context.getName() + " due to " + cause.getMessage();
}
}
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java?rev=813496&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java Thu Sep 10 16:29:48 2009
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.management.event;
+
+import java.util.EventObject;
+
+import org.apache.camel.CamelContext;
+
+/**
+ * @version $Revision$
+ */
+public class CamelContextStopFailureEvent extends EventObject {
+
+ private CamelContext context;
+ private Exception cause;
+
+ public CamelContextStopFailureEvent(CamelContext context, Exception cause) {
+ super(context);
+ this.context = context;
+ this.cause = cause;
+ }
+
+ public CamelContext getContext() {
+ return context;
+ }
+
+ public Exception getCause() {
+ return cause;
+ }
+
+ @Override
+ public String toString() {
+ return "Failed to stop Camel: " + context.getName() + " due to " + cause.getMessage();
+ }
+
+}
\ No newline at end of file
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureEvent.java (from r813351, camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureEvent.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureEvent.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java&r1=813351&r2=813496&rev=813496&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureEvent.java Thu Sep 10 16:29:48 2009
@@ -23,11 +23,11 @@
/**
* @version $Revision$
*/
-public class ExchangeFailedEvent extends EventObject {
+public class ExchangeFailureEvent extends EventObject {
private final Exchange exchange;
- public ExchangeFailedEvent(Exchange source) {
+ public ExchangeFailureEvent(Exchange source) {
super(source);
this.exchange = source;
}
@@ -38,7 +38,7 @@
@Override
public String toString() {
- return "Exchange failed: " + exchange;
+ return "Exchange failure: " + exchange;
}
}
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureEvent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java?rev=813496&r1=813495&r2=813496&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java Thu Sep 10 16:29:48 2009
@@ -58,9 +58,9 @@
@Override
public String toString() {
if (isDeadLetterChannel()) {
- return "Exchange: " + exchange + (handled ? " handled" : "") + " by dead letter channel: " + failureHandler;
+ return "Exchange failed: " + exchange + " but was handled by dead letter channel: " + failureHandler;
} else {
- return "Exchange: " + exchange + (handled ? " handled" : "") + " by: " + failureHandler;
+ return "Exchange failed: " + exchange + " but was processed by: " + failureHandler;
}
}
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java?rev=813496&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java Thu Sep 10 16:29:48 2009
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.management.event;
+
+import java.util.EventObject;
+
+import org.apache.camel.CamelContext;
+
+/**
+ * @version $Revision$
+ */
+public class ServiceStartupFailureEvent extends EventObject {
+
+ private CamelContext context;
+ private Object service;
+ private Exception cause;
+
+ public ServiceStartupFailureEvent(CamelContext context, Object service, Exception cause) {
+ super(service);
+ this.context = context;
+ this.service = service;
+ this.cause = cause;
+ }
+
+ public CamelContext getContext() {
+ return context;
+ }
+
+ public Object getService() {
+ return service;
+ }
+
+ public Exception getCause() {
+ return cause;
+ }
+
+ @Override
+ public String toString() {
+ return "Failure to start service: " + service + " due to " + cause.getMessage();
+ }
+
+}
\ No newline at end of file
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java (from r813351, camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStoppingFailedEvent.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStoppingFailedEvent.java&r1=813351&r2=813496&rev=813496&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStoppingFailedEvent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java Thu Sep 10 16:29:48 2009
@@ -23,13 +23,13 @@
/**
* @version $Revision$
*/
-public class ServiceStoppingFailedEvent extends EventObject {
+public class ServiceStopFailureEvent extends EventObject {
private CamelContext context;
private Object service;
private Exception cause;
- public ServiceStoppingFailedEvent(CamelContext context, Object service, Exception cause) {
+ public ServiceStopFailureEvent(CamelContext context, Object service, Exception cause) {
super(service);
this.context = context;
this.service = service;
@@ -50,7 +50,7 @@
@Override
public String toString() {
- return "Stopping service: " + service + " failed due to " + cause.getMessage();
+ return "Failure to stop service: " + service + " due to " + cause.getMessage();
}
}
\ No newline at end of file
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java?rev=813496&r1=813495&r2=813496&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/EventFactory.java Thu Sep 10 16:29:48 2009
@@ -52,10 +52,19 @@
* Creates an {@link EventObject} for Camel failing to start
*
* @param context camel context
- * @param cause the cause exception that prevents Camel from starting
+ * @param cause the cause exception
* @return the created event
*/
- EventObject createCamelContextStartupFailedEvent(CamelContext context, Exception cause);
+ EventObject createCamelContextStartupFailureEvent(CamelContext context, Exception cause);
+
+ /**
+ * Creates an {@link EventObject} for Camel failing to stop cleanly
+ *
+ * @param context camel context
+ * @param cause the cause exception
+ * @return the created event
+ */
+ EventObject createCamelContextStopFailureEvent(CamelContext context, Exception cause);
/**
* Creates an {@link EventObject} for Camel is stopping.
@@ -74,14 +83,24 @@
EventObject createCamelContextStoppedEvent(CamelContext context);
/**
- * Creates an {@link EventObject} for a Service failed to stop with success
+ * Creates an {@link EventObject} for a Service failed to start cleanly
+ *
+ * @param context camel context
+ * @param service the service
+ * @param cause the cause exception
+ * @return the created event
+ */
+ EventObject createServiceStartupFailureEvent(CamelContext context, Object service, Exception cause);
+
+ /**
+ * Creates an {@link EventObject} for a Service failed to stop cleanly
*
* @param context camel context
* @param service the service
- * @param cause the cause exception that prevents Camel from starting
+ * @param cause the cause exception
* @return the created event
*/
- EventObject createServiceStoppingFailedEvent(CamelContext context, Object service, Exception cause);
+ EventObject createServiceStopFailureEvent(CamelContext context, Object service, Exception cause);
/**
* Creates an {@link EventObject} for {@link Route} has been started successfully.
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=813496&r1=813495&r2=813496&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 Thu Sep 10 16:29:48 2009
@@ -80,7 +80,7 @@
if (factory == null) {
return;
}
- EventObject event = factory.createCamelContextStartupFailedEvent(context, cause);
+ EventObject event = factory.createCamelContextStartupFailureEvent(context, cause);
if (event == null) {
return;
}
@@ -119,7 +119,7 @@
doNotifyEvent(notifier, event);
}
- public static void notifyServiceStoppingFailed(CamelContext context, Object service, Exception cause) {
+ public static void notifyCamelContextStopFailed(CamelContext context, Exception cause) {
EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
if (notifier == null) {
return;
@@ -128,7 +128,39 @@
if (factory == null) {
return;
}
- EventObject event = factory.createServiceStoppingFailedEvent(context, service, cause);
+ EventObject event = factory.createCamelContextStopFailureEvent(context, cause);
+ if (event == null) {
+ return;
+ }
+ doNotifyEvent(notifier, event);
+ }
+
+ public static void notifyServiceStopFailure(CamelContext context, Object service, Exception cause) {
+ EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
+ if (notifier == null) {
+ return;
+ }
+ EventFactory factory = context.getManagementStrategy().getEventFactory();
+ if (factory == null) {
+ return;
+ }
+ EventObject event = factory.createServiceStopFailureEvent(context, service, cause);
+ if (event == null) {
+ return;
+ }
+ doNotifyEvent(notifier, event);
+ }
+
+ public static void notifyServiceStartupFailure(CamelContext context, Object service, Exception cause) {
+ EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
+ if (notifier == null) {
+ return;
+ }
+ EventFactory factory = context.getManagementStrategy().getEventFactory();
+ if (factory == null) {
+ return;
+ }
+ EventObject event = factory.createServiceStartupFailureEvent(context, service, cause);
if (event == null) {
return;
}
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=813496&r1=813495&r2=813496&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 Thu Sep 10 16:29:48 2009
@@ -30,7 +30,7 @@
import org.apache.camel.management.event.CamelContextStoppingEvent;
import org.apache.camel.management.event.ExchangeCompletedEvent;
import org.apache.camel.management.event.ExchangeCreatedEvent;
-import org.apache.camel.management.event.ExchangeFailedEvent;
+import org.apache.camel.management.event.ExchangeFailureEvent;
import org.apache.camel.management.event.RouteStartedEvent;
import org.apache.camel.management.event.RouteStoppedEvent;
import org.apache.camel.spi.EventNotifier;
@@ -102,7 +102,7 @@
assertIsInstanceOf(RouteStartedEvent.class, events.get(2));
assertIsInstanceOf(CamelContextStartedEvent.class, events.get(3));
assertIsInstanceOf(ExchangeCreatedEvent.class, events.get(4));
- assertIsInstanceOf(ExchangeFailedEvent.class, events.get(5));
+ assertIsInstanceOf(ExchangeFailureEvent.class, events.get(5));
context.stop();
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=813496&r1=813495&r2=813496&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 Thu Sep 10 16:29:48 2009
@@ -27,7 +27,7 @@
import org.apache.camel.management.event.CamelContextStartingEvent;
import org.apache.camel.management.event.CamelContextStoppedEvent;
import org.apache.camel.management.event.CamelContextStoppingEvent;
-import org.apache.camel.management.event.ServiceStoppingFailedEvent;
+import org.apache.camel.management.event.ServiceStopFailureEvent;
import org.apache.camel.spi.EventNotifier;
/**
@@ -75,11 +75,11 @@
assertIsInstanceOf(CamelContextStartingEvent.class, events.get(0));
assertIsInstanceOf(CamelContextStartedEvent.class, events.get(1));
assertIsInstanceOf(CamelContextStoppingEvent.class, events.get(2));
- ServiceStoppingFailedEvent event = assertIsInstanceOf(ServiceStoppingFailedEvent.class, events.get(3));
+ ServiceStopFailureEvent event = assertIsInstanceOf(ServiceStopFailureEvent.class, events.get(3));
assertIsInstanceOf(CamelContextStoppedEvent.class, events.get(4));
assertEquals("Fail B", event.getCause().getMessage());
- assertEquals("Stopping service: B failed due to Fail B", event.toString());
+ assertEquals("Failure to stop service: B due to Fail B", event.toString());
}
private class MyService implements Service {