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 16:01:39 UTC
svn commit: r813447 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel: impl/ management/
management/event/ spi/ util/
Author: davsclaus
Date: Thu Sep 10 14:01:39 2009
New Revision: 813447
URL: http://svn.apache.org/viewvc?rev=813447&view=rev
Log:
Renamed a class to a better name.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java (contents, props changed)
- copied, changed from r813351, camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.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/spi/EventFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/EventHelper.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=813447&r1=813446&r2=813447&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 14:01:39 2009
@@ -861,7 +861,7 @@
doStartCamel();
} catch (Exception e) {
// fire event that we failed to start
- EventHelper.notifyCamelContextStartingFailed(this, e);
+ EventHelper.notifyCamelContextStartupFailed(this, e);
// rethrown cause
throw 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=813447&r1=813446&r2=813447&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 14:01:39 2009
@@ -24,7 +24,7 @@
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.CamelContextStartingFailedEvent;
+import org.apache.camel.management.event.CamelContextStartupFailedEvent;
import org.apache.camel.management.event.CamelContextStoppedEvent;
import org.apache.camel.management.event.CamelContextStoppingEvent;
import org.apache.camel.management.event.ExchangeCompletedEvent;
@@ -57,8 +57,8 @@
return new CamelContextStoppedEvent(context);
}
- public EventObject createCamelContextStartingFailedEvent(CamelContext context, Exception cause) {
- return new CamelContextStartingFailedEvent(context, cause);
+ public EventObject createCamelContextStartupFailedEvent(CamelContext context, Exception cause) {
+ return new CamelContextStartupFailedEvent(context, cause);
}
public EventObject createServiceStoppingFailedEvent(CamelContext context, Object service, Exception cause) {
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java (from r813351, camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.java&r1=813351&r2=813447&rev=813447&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java Thu Sep 10 14:01:39 2009
@@ -23,12 +23,12 @@
/**
* @version $Revision$
*/
-public class CamelContextStartingFailedEvent extends EventObject {
+public class CamelContextStartupFailedEvent extends EventObject {
private CamelContext context;
private Exception cause;
- public CamelContextStartingFailedEvent(CamelContext context, Exception cause) {
+ public CamelContextStartupFailedEvent(CamelContext context, Exception cause) {
super(context);
this.context = context;
this.cause = cause;
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailedEvent.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=813447&r1=813446&r2=813447&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 14:01:39 2009
@@ -55,7 +55,7 @@
* @param cause the cause exception that prevents Camel from starting
* @return the created event
*/
- EventObject createCamelContextStartingFailedEvent(CamelContext context, Exception cause);
+ EventObject createCamelContextStartupFailedEvent(CamelContext context, Exception cause);
/**
* Creates an {@link EventObject} for Camel is stopping.
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=813447&r1=813446&r2=813447&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 14:01:39 2009
@@ -71,7 +71,7 @@
doNotifyEvent(notifier, event);
}
- public static void notifyCamelContextStartingFailed(CamelContext context, Exception cause) {
+ public static void notifyCamelContextStartupFailed(CamelContext context, Exception cause) {
EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
if (notifier == null) {
return;
@@ -80,7 +80,7 @@
if (factory == null) {
return;
}
- EventObject event = factory.createCamelContextStartingFailedEvent(context, cause);
+ EventObject event = factory.createCamelContextStartupFailedEvent(context, cause);
if (event == null) {
return;
}