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/09 17:39:18 UTC
svn commit: r813000 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/management/
camel-core/src/main/java/org/apache/camel/management/event/ camel-co...
Author: davsclaus
Date: Wed Sep 9 15:39:18 2009
New Revision: 813000
URL: http://svn.apache.org/viewvc?rev=813000&view=rev
Log:
CAMEL-1933: Added event if starting Camel failed.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.java (with props)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java (with props)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java (with props)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml (contents, props changed)
- copied, changed from r812410, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.xml
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/RoutesBuilder.java
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
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.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/RoutesBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/RoutesBuilder.java?rev=813000&r1=812999&r2=813000&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/RoutesBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/RoutesBuilder.java Wed Sep 9 15:39:18 2009
@@ -28,6 +28,7 @@
* Adds the routes from this Route Builder to the CamelContext.
*
* @param context the Camel context
+ * @throws Exception is thrown if initialization of routes failed
*/
void addRoutesToCamelContext(CamelContext context) throws Exception;
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=813000&r1=812999&r2=813000&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 Wed Sep 9 15:39:18 2009
@@ -855,6 +855,17 @@
LOG.info("Apache Camel " + getVersion() + " (CamelContext:" + getName() + ") is starting");
EventHelper.notifyCamelContextStarting(this);
+ try {
+ doStartCamel();
+ } catch (Exception e) {
+ // fire event that we failed to start
+ EventHelper.notifyCamelContextStartingFailedEvent(this, e);
+ // rethrown cause
+ throw e;
+ }
+ }
+
+ private void doStartCamel() throws Exception {
startServices(producerServicePool);
if (isStreamCaching()) {
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=813000&r1=812999&r2=813000&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 Wed Sep 9 15:39:18 2009
@@ -24,6 +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.CamelContextStoppedEvent;
import org.apache.camel.management.event.CamelContextStoppingEvent;
import org.apache.camel.management.event.ExchangeCompletedEvent;
@@ -55,6 +56,10 @@
return new CamelContextStoppedEvent(context);
}
+ public EventObject createCamelContextStartingFailedEvent(CamelContext context, Exception cause) {
+ return new CamelContextStartingFailedEvent(context, cause);
+ }
+
public EventObject createRouteStartedEvent(Route route) {
return new RouteStartedEvent(route);
}
Added: 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/CamelContextStartingFailedEvent.java?rev=813000&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.java Wed Sep 9 15:39:18 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 CamelContextStartingFailedEvent extends EventObject {
+
+ private CamelContext context;
+ private Exception cause;
+
+ public CamelContextStartingFailedEvent(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 "Starting CamelContext: " + context.getName() + " failed due to " + cause.getMessage();
+ }
+
+}
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingFailedEvent.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=813000&r1=812999&r2=813000&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 Wed Sep 9 15:39:18 2009
@@ -32,24 +32,96 @@
*/
public interface EventFactory {
+ /**
+ * Creates an {@link EventObject} for Camel is starting.
+ *
+ * @param context camel context
+ * @return the created event
+ */
EventObject createCamelContextStartingEvent(CamelContext context);
+ /**
+ * Creates an {@link EventObject} for Camel has been started successfully.
+ *
+ * @param context camel context
+ * @return the created event
+ */
EventObject createCamelContextStartedEvent(CamelContext context);
+ /**
+ * Creates an {@link EventObject} for Camel failing to start
+ *
+ * @param context camel context
+ * @param cause the cause exception that prevents Camel from starting
+ * @return the created event
+ */
+ EventObject createCamelContextStartingFailedEvent(CamelContext context, Exception cause);
+
+ /**
+ * Creates an {@link EventObject} for Camel is stopping.
+ *
+ * @param context camel context
+ * @return the created event
+ */
EventObject createCamelContextStoppingEvent(CamelContext context);
+ /**
+ * Creates an {@link EventObject} for Camel has been stopped successfully.
+ *
+ * @param context camel context
+ * @return the created event
+ */
EventObject createCamelContextStoppedEvent(CamelContext context);
+ /**
+ * Creates an {@link EventObject} for {@link Route} has been started successfully.
+ *
+ * @param route the route
+ * @return the created event
+ */
EventObject createRouteStartedEvent(Route route);
+ /**
+ * Creates an {@link EventObject} for {@link Route} has been stopped successfully.
+ *
+ * @param route the route
+ * @return the created event
+ */
EventObject createRouteStoppedEvent(Route route);
+ /**
+ * Creates an {@link EventObject} when an {@link org.apache.camel.Exchange} has been created
+ *
+ * @param exchange the exchange
+ * @return the created event
+ */
EventObject createExchangeCreatedEvent(Exchange exchange);
+ /**
+ * Creates an {@link EventObject} when an {@link org.apache.camel.Exchange} has been completed successfully
+ *
+ * @param exchange the exchange
+ * @return the created event
+ */
EventObject createExchangeCompletedEvent(Exchange exchange);
+ /**
+ * Creates an {@link EventObject} when an {@link org.apache.camel.Exchange} has failed
+ *
+ * @param exchange the exchange
+ * @return the created event
+ */
EventObject createExchangeFailedEvent(Exchange exchange);
+ /**
+ * Creates an {@link EventObject} when an {@link org.apache.camel.Exchange} has failed
+ * but was handled by the Camel error handlers such as an dead letter channel.
+ *
+ * @param exchange the exchange
+ * @param failureHandler the failure handler such as moving the message to a dead letter queue
+ * @param deadLetterChannel whether it was a dead letter channel or not handling the failure
+ * @return the created event
+ */
EventObject createExchangeFailureHandledEvent(Exchange exchange, Processor failureHandler, boolean deadLetterChannel);
}
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=813000&r1=812999&r2=813000&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 Sep 9 15:39:18 2009
@@ -71,6 +71,22 @@
doNotifyEvent(notifier, event);
}
+ public static void notifyCamelContextStartingFailedEvent(CamelContext context, Exception cause) {
+ EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
+ if (notifier == null) {
+ return;
+ }
+ EventFactory factory = context.getManagementStrategy().getEventFactory();
+ if (factory == null) {
+ return;
+ }
+ EventObject event = factory.createCamelContextStartingFailedEvent(context, cause);
+ if (event == null) {
+ return;
+ }
+ doNotifyEvent(notifier, event);
+ }
+
public static void notifyCamelContextStopping(CamelContext context) {
EventNotifier notifier = context.getManagementStrategy().getEventNotifier();
if (notifier == null) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java?rev=813000&r1=812999&r2=813000&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java Wed Sep 9 15:39:18 2009
@@ -17,15 +17,15 @@
package org.apache.camel.management;
import java.util.Set;
+import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.management.Attribute;
import org.apache.camel.CamelContext;
+import org.apache.camel.CamelExecutionException;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
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=813000&r1=812999&r2=813000&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 Sep 9 15:39:18 2009
@@ -59,6 +59,8 @@
import org.apache.camel.processor.interceptor.TraceFormatter;
import org.apache.camel.processor.interceptor.Tracer;
import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.spi.EventFactory;
+import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.FactoryFinderResolver;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
@@ -238,6 +240,18 @@
getContext().setManagementStrategy(managementStrategy);
}
+ EventFactory eventFactory = getBeanForType(EventFactory.class);
+ if (eventFactory != null) {
+ LOG.info("Using custom EventFactory: " + eventFactory);
+ getContext().getManagementStrategy().setEventFactory(eventFactory);
+ }
+
+ EventNotifier eventNotifier = getBeanForType(EventNotifier.class);
+ if (eventNotifier != null) {
+ LOG.info("Using custom EventNotifier: " + eventNotifier);
+ getContext().getManagementStrategy().setEventNotifier(eventNotifier);
+ }
+
// add global interceptors
Map<String, InterceptStrategy> interceptStrategies = getContext().getRegistry().lookupByType(InterceptStrategy.class);
if (interceptStrategies != null && !interceptStrategies.isEmpty()) {
Added: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java?rev=813000&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java (added)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java Wed Sep 9 15:39:18 2009
@@ -0,0 +1,43 @@
+/**
+ * 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.spring.management;
+
+import java.util.ArrayList;
+import java.util.EventObject;
+import java.util.List;
+
+import org.apache.camel.spi.EventNotifier;
+
+/**
+ * @version $Revision$
+ */
+public class MyEventNotifier implements EventNotifier {
+
+ private List<EventObject> events = new ArrayList<EventObject>();
+
+ public void notify(EventObject event) throws Exception {
+ events.add(event);
+ }
+
+ public boolean isEnabled(EventObject event) {
+ return true;
+ }
+
+ public List<EventObject> getEvents() {
+ return events;
+ }
+}
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/MyEventNotifier.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java?rev=813000&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java (added)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java Wed Sep 9 15:39:18 2009
@@ -0,0 +1,46 @@
+/**
+ * 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.spring.management;
+
+import org.apache.camel.ResolveEndpointFailedException;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version $Revision$
+ */
+public class SpringCamelContextStartingFailedEventTest extends SpringTestSupport {
+
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ AbstractXmlApplicationContext answer = null;
+ try {
+ answer = new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml");
+ fail("Should thrown an exception");
+ } catch (ResolveEndpointFailedException e) {
+ // expected
+ }
+
+ // fallback to load another file that works
+ answer = new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringManagedErrorHandlerTest.xml");
+ return answer;
+ }
+
+ public void testReady() {
+ // noop
+ }
+}
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml (from r812410, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.xml)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.xml&r1=812410&r2=813000&rev=813000&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml Wed Sep 9 15:39:18 2009
@@ -22,24 +22,12 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="dlc" class="org.apache.camel.builder.DeadLetterChannelBuilder">
- <property name="deadLetterUri" value="mock:read"/>
- </bean>
+ <bean id="myEventNotifier" class="org.apache.camel.spring.management.MyEventNotifier"/>
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<route>
<from uri="direct:foo"/>
- <to uri="mock:foo"/>
- </route>
-
- <route errorHandlerRef="dlc">
- <from uri="direct:bar"/>
- <to uri="mock:bar"/>
- </route>
-
- <route>
- <from uri="direct:baz"/>
- <to uri="mock:baz"/>
+ <to uri="xxx:foo"/>
</route>
</camelContext>
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml