Author: davsclaus
Date: Fri Aug 28 04:59:55 2009
New Revision: 808754
URL: http://svn.apache.org/viewvc?rev=808754&view=rev
Log:
Renamed events to be more preciese
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
(contents, props changed)
- copied, changed from r808407,
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
(contents, props changed)
- copied, changed from r808407,
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStopEvent.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStopEvent.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultEventFactory.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
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=808754&r1=808753&r2=808754&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
Fri Aug 28 04:59:55 2009
@@ -28,8 +28,8 @@
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.RouteStartEvent;
-import org.apache.camel.management.event.RouteStopEvent;
+import org.apache.camel.management.event.RouteStartedEvent;
+import org.apache.camel.management.event.RouteStoppedEvent;
import org.apache.camel.spi.EventFactory;
/**
@@ -53,12 +53,12 @@
return new CamelContextStoppedEvent(context);
}
- public EventObject createRouteStartEvent(Route route) {
- return new RouteStartEvent(route);
+ public EventObject createRouteStartedEvent(Route route) {
+ return new RouteStartedEvent(route);
}
- public EventObject createRouteStopEvent(Route route) {
- return new RouteStopEvent(route);
+ public EventObject createRouteStoppedEvent(Route route) {
+ return new RouteStoppedEvent(route);
}
public EventObject createExchangeCreatedEvent(Exchange exchange) {
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
(from r808407,
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartEvent.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartEvent.java&r1=808407&r2=808754&rev=808754&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartEvent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
Fri Aug 28 04:59:55 2009
@@ -23,11 +23,11 @@
/**
* @version $Revision$
*/
-public class RouteStartEvent extends EventObject {
+public class RouteStartedEvent extends EventObject {
private Route route;
- public RouteStartEvent(Route source) {
+ public RouteStartedEvent(Route source) {
super(source);
this.route = source;
}
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
(from r808407,
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStopEvent.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStopEvent.java&r1=808407&r2=808754&rev=808754&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStopEvent.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
Fri Aug 28 04:59:55 2009
@@ -23,11 +23,11 @@
/**
* @version $Revision$
*/
-public class RouteStopEvent extends EventObject {
+public class RouteStoppedEvent extends EventObject {
private Route route;
- public RouteStopEvent(Route source) {
+ public RouteStoppedEvent(Route source) {
super(source);
this.route = source;
}
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.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=808754&r1=808753&r2=808754&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
Fri Aug 28 04:59:55 2009
@@ -39,9 +39,9 @@
EventObject createCamelContextStoppedEvent(CamelContext context);
- EventObject createRouteStartEvent(Route route);
+ EventObject createRouteStartedEvent(Route route);
- EventObject createRouteStopEvent(Route route);
+ EventObject createRouteStoppedEvent(Route route);
EventObject createExchangeCreatedEvent(Exchange exchange);
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=808754&r1=808753&r2=808754&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
Fri Aug 28 04:59:55 2009
@@ -111,7 +111,7 @@
if (factory == null) {
return;
}
- EventObject event = factory.createRouteStartEvent(route);
+ EventObject event = factory.createRouteStartedEvent(route);
if (event == null) {
return;
}
@@ -127,7 +127,7 @@
if (factory == null) {
return;
}
- EventObject event = factory.createRouteStopEvent(route);
+ EventObject event = factory.createRouteStoppedEvent(route);
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=808754&r1=808753&r2=808754&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
Fri Aug 28 04:59:55 2009
@@ -31,8 +31,8 @@
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.RouteStartEvent;
-import org.apache.camel.management.event.RouteStopEvent;
+import org.apache.camel.management.event.RouteStartedEvent;
+import org.apache.camel.management.event.RouteStoppedEvent;
import org.apache.camel.spi.EventNotifier;
/**
@@ -72,8 +72,8 @@
assertEquals(6, events.size());
assertIsInstanceOf(CamelContextStartingEvent.class, events.get(0));
- assertIsInstanceOf(RouteStartEvent.class, events.get(1));
- assertIsInstanceOf(RouteStartEvent.class, events.get(2));
+ assertIsInstanceOf(RouteStartedEvent.class, events.get(1));
+ assertIsInstanceOf(RouteStartedEvent.class, events.get(2));
assertIsInstanceOf(CamelContextStartedEvent.class, events.get(3));
assertIsInstanceOf(ExchangeCreatedEvent.class, events.get(4));
assertIsInstanceOf(ExchangeCompletedEvent.class, events.get(5));
@@ -82,8 +82,8 @@
assertEquals(10, events.size());
assertIsInstanceOf(CamelContextStoppingEvent.class, events.get(6));
- assertIsInstanceOf(RouteStopEvent.class, events.get(7));
- assertIsInstanceOf(RouteStopEvent.class, events.get(8));
+ assertIsInstanceOf(RouteStoppedEvent.class, events.get(7));
+ assertIsInstanceOf(RouteStoppedEvent.class, events.get(8));
assertIsInstanceOf(CamelContextStoppedEvent.class, events.get(9));
}
@@ -98,8 +98,8 @@
assertEquals(6, events.size());
assertIsInstanceOf(CamelContextStartingEvent.class, events.get(0));
- assertIsInstanceOf(RouteStartEvent.class, events.get(1));
- assertIsInstanceOf(RouteStartEvent.class, events.get(2));
+ assertIsInstanceOf(RouteStartedEvent.class, events.get(1));
+ assertIsInstanceOf(RouteStartedEvent.class, events.get(2));
assertIsInstanceOf(CamelContextStartedEvent.class, events.get(3));
assertIsInstanceOf(ExchangeCreatedEvent.class, events.get(4));
assertIsInstanceOf(ExchangeFailedEvent.class, events.get(5));
@@ -108,8 +108,8 @@
assertEquals(10, events.size());
assertIsInstanceOf(CamelContextStoppingEvent.class, events.get(6));
- assertIsInstanceOf(RouteStopEvent.class, events.get(7));
- assertIsInstanceOf(RouteStopEvent.class, events.get(8));
+ assertIsInstanceOf(RouteStoppedEvent.class, events.get(7));
+ assertIsInstanceOf(RouteStoppedEvent.class, events.get(8));
assertIsInstanceOf(CamelContextStoppedEvent.class, events.get(9));
}
