You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/07/15 20:50:18 UTC
[1/2] karaf-decanter git commit: [KARAF-5033] Improve the Camel
Tracer and add Camel Event Notifier
Repository: karaf-decanter
Updated Branches:
refs/heads/master 4e53beb01 -> a3d3ea29a
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java
----------------------------------------------------------------------
diff --git a/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java
new file mode 100644
index 0000000..5c0769d
--- /dev/null
+++ b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java
@@ -0,0 +1,346 @@
+package org.apache.karaf.decanter.collector.camel;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.EventObject;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.RouteNode;
+import org.apache.camel.spi.TracedRouteNodes;
+import org.apache.camel.support.EventNotifierSupport;
+import org.apache.camel.util.MessageHelper;
+import org.apache.camel.management.event.AbstractExchangeEvent;
+import org.apache.camel.management.event.CamelContextResumeFailureEvent;
+import org.apache.camel.management.event.CamelContextResumedEvent;
+import org.apache.camel.management.event.CamelContextResumingEvent;
+import org.apache.camel.management.event.CamelContextStartedEvent;
+import org.apache.camel.management.event.CamelContextStartingEvent;
+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.CamelContextSuspendedEvent;
+import org.apache.camel.management.event.CamelContextSuspendingEvent;
+import org.apache.camel.management.event.ExchangeCompletedEvent;
+import org.apache.camel.management.event.ExchangeCreatedEvent;
+import org.apache.camel.management.event.ExchangeFailureHandledEvent;
+import org.apache.camel.management.event.ExchangeRedeliveryEvent;
+import org.apache.camel.management.event.ExchangeSendingEvent;
+import org.apache.camel.management.event.ExchangeSentEvent;
+import org.apache.camel.management.event.RouteAddedEvent;
+import org.apache.camel.management.event.RouteRemovedEvent;
+import org.apache.camel.management.event.RouteStartedEvent;
+import org.apache.camel.management.event.RouteStoppedEvent;
+import org.apache.camel.management.event.ServiceStartupFailureEvent;
+import org.apache.camel.management.event.ServiceStopFailureEvent;
+
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventAdmin;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class DecanterEventNotifier extends EventNotifierSupport {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DecanterEventNotifier.class.getName());
+
+ private EventAdmin eventAdmin;
+ private String camelContextMatcher = ".*";
+ private String routeMatcher = ".*";
+ private DecanterCamelEventExtender extender = null;
+
+ public EventAdmin getEventAdmin() {
+ return eventAdmin;
+ }
+
+ public void setEventAdmin(EventAdmin eventAdmin) {
+ this.eventAdmin = eventAdmin;
+ }
+
+ public void setCamelContextMatcher(String camelContextMatcher) {
+ this.camelContextMatcher = camelContextMatcher;
+ }
+
+ public void setRouteMatcher(String routeMatcher) {
+ this.routeMatcher = routeMatcher;
+ }
+
+ public void setExtender(DecanterCamelEventExtender extender) {
+ this.extender = extender;
+ }
+
+ @Override
+ public boolean isEnabled(EventObject eventObject) {
+ if (eventObject != null) {
+ if (eventObject instanceof AbstractExchangeEvent) {
+ AbstractExchangeEvent event = (AbstractExchangeEvent) eventObject;
+ if (event.getExchange().getFromRouteId() != null) {
+ return (event.getExchange().getFromRouteId().matches(routeMatcher) && event.getExchange().getContext().getName().matches(camelContextMatcher));
+ } else {
+ return (event.getExchange().getContext().getName().matches(camelContextMatcher));
+ }
+ }
+ if (eventObject instanceof CamelContextResumedEvent) {
+ return ((CamelContextResumedEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof CamelContextResumeFailureEvent) {
+ return ((CamelContextResumeFailureEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof CamelContextResumingEvent) {
+ return ((CamelContextResumingEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof CamelContextStartedEvent) {
+ return ((CamelContextStartedEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof CamelContextStartingEvent) {
+ return ((CamelContextStartingEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof CamelContextStartupFailureEvent) {
+ return ((CamelContextStartupFailureEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof CamelContextStopFailureEvent) {
+ return ((CamelContextStopFailureEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof CamelContextStoppedEvent) {
+ return ((CamelContextStoppedEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof CamelContextStoppingEvent) {
+ return ((CamelContextStoppingEvent) eventObject).getContext().getName().matches(camelContextMatcher);
+ }
+ if (eventObject instanceof RouteAddedEvent) {
+ return ((RouteAddedEvent) eventObject).getRoute().getRouteContext().getCamelContext().getName().matches(camelContextMatcher)
+ && ((RouteAddedEvent) eventObject).getRoute().getId().matches(routeMatcher);
+ }
+ if (eventObject instanceof RouteRemovedEvent) {
+ return ((RouteRemovedEvent) eventObject).getRoute().getRouteContext().getCamelContext().getName().matches(camelContextMatcher)
+ && ((RouteRemovedEvent) eventObject).getRoute().getId().matches(routeMatcher);
+ }
+ if (eventObject instanceof RouteStartedEvent) {
+ return ((RouteStartedEvent) eventObject).getRoute().getRouteContext().getCamelContext().getName().matches(camelContextMatcher)
+ && ((RouteStartedEvent) eventObject).getRoute().getId().matches(routeMatcher);
+ }
+ if (eventObject instanceof RouteStoppedEvent) {
+ return ((RouteStoppedEvent) eventObject).getRoute().getRouteContext().getCamelContext().getName().matches(camelContextMatcher)
+ && ((RouteStoppedEvent) eventObject).getRoute().getId().matches(routeMatcher);
+ }
+ }
+ return false;
+ }
+
+ public void notify(EventObject event) throws Exception {
+ try {
+ Map<String, Object> eventMap = createEvent(event,
+ event instanceof AbstractExchangeEvent ? ((AbstractExchangeEvent) event)
+ .getExchange() : null);
+ boolean post = false;
+ if (event instanceof ExchangeSentEvent && !isIgnoreExchangeEvents() && !isIgnoreExchangeSentEvents()) {
+ ExchangeSentEvent sent = (ExchangeSentEvent) event;
+ eventMap.put("sentToEndpointUri", sent.getEndpoint()
+ .getEndpointUri());
+ eventMap.put("sentTimeTaken", sent.getTimeTaken());
+ post = true;
+ }
+ if (event instanceof ExchangeSendingEvent && !isIgnoreExchangeEvents() && !isIgnoreExchangeSendingEvents()) {
+ ExchangeSendingEvent sending = (ExchangeSendingEvent) event;
+ eventMap.put("sendingToEndpointUri", sending.getEndpoint().getEndpointUri());
+ post = true;
+ }
+ if (event instanceof ExchangeFailureHandledEvent && !isIgnoreExchangeEvents() && !isIgnoreExchangeFailedEvents()) {
+ ExchangeFailureHandledEvent failHandled = (ExchangeFailureHandledEvent) event;
+ eventMap.put("failureIsHandled", failHandled.isHandled());
+ eventMap.put("failureIsDeadLetterChannel", failHandled.isDeadLetterChannel());
+ eventMap.put("failureHandler", failHandled.getFailureHandler() == null ? "null"
+ : failHandled.getFailureHandler().getClass().getName());
+ post = true;
+ }
+ if (event instanceof ExchangeRedeliveryEvent && !isIgnoreExchangeEvents() && !isIgnoreExchangeRedeliveryEvents()) {
+ ExchangeRedeliveryEvent redelivery = (ExchangeRedeliveryEvent) event;
+ eventMap.put("redeliveryAttempt", redelivery.getAttempt());
+ post = true;
+ }
+ if (event instanceof RouteStartedEvent && !isIgnoreRouteEvents()) {
+ RouteStartedEvent route = (RouteStartedEvent) event;
+ eventMap.put("routeId", route.getRoute().getId());
+ eventMap.put("camelContextName", route.getRoute().getRouteContext().getCamelContext().getName());
+ post = true;
+ }
+ if (event instanceof RouteAddedEvent && !isIgnoreRouteEvents()) {
+ RouteAddedEvent route = (RouteAddedEvent) event;
+ eventMap.put("routeId", route.getRoute().getId());
+ eventMap.put("camelContextName", route.getRoute().getRouteContext().getCamelContext().getName());
+ post = true;
+ }
+ if (event instanceof RouteRemovedEvent && !isIgnoreRouteEvents()) {
+ RouteRemovedEvent route = (RouteRemovedEvent) event;
+ eventMap.put("routeId", route.getRoute().getId());
+ eventMap.put("camelContextName", route.getRoute().getRouteContext().getCamelContext().getName());
+ post = true;
+ }
+ if (event instanceof RouteStoppedEvent && !isIgnoreRouteEvents()) {
+ RouteStoppedEvent route = (RouteStoppedEvent) event;
+ eventMap.put("routeId", route.getRoute().getId());
+ eventMap.put("camelContextName", route.getRoute().getRouteContext().getCamelContext().getName());
+ post = true;
+ }
+ if (event instanceof ServiceStartupFailureEvent && !isIgnoreServiceEvents()) {
+ ServiceStartupFailureEvent service = (ServiceStartupFailureEvent) event;
+ eventMap.put("serviceName", service.getService().getClass().getName());
+ eventMap.put("camelContextName", service.getContext().getName());
+ eventMap.put("cause", service.getCause().toString());
+ post = true;
+ }
+ if (event instanceof ServiceStopFailureEvent && !isIgnoreServiceEvents()) {
+ ServiceStopFailureEvent service = (ServiceStopFailureEvent) event;
+ eventMap.put("serviceName", service.getService().getClass().getName());
+ eventMap.put("camelContextName", service.getContext().getName());
+ eventMap.put("cause", service.getCause().toString());
+ post = true;
+ }
+ if (event instanceof CamelContextResumedEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextResumedEvent context = (CamelContextResumedEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ post = true;
+ }
+ if (event instanceof CamelContextResumeFailureEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextResumeFailureEvent context = (CamelContextResumeFailureEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ eventMap.put("cause", context.getCause().toString());
+ post = true;
+ }
+ if (event instanceof CamelContextResumingEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextResumingEvent context = (CamelContextResumingEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ post = true;
+ }
+ if (event instanceof CamelContextStartedEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextStartedEvent context = (CamelContextStartedEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ post = true;
+ }
+ if (event instanceof CamelContextStartingEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextStartingEvent context = (CamelContextStartingEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ post = true;
+ }
+ if (event instanceof CamelContextStartupFailureEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextStartupFailureEvent context = (CamelContextStartupFailureEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ eventMap.put("cause", context.getCause().toString());
+ post = true;
+ }
+ if (event instanceof CamelContextStopFailureEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextStopFailureEvent context = (CamelContextStopFailureEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ eventMap.put("cause", context.getCause().toString());
+ post = true;
+ }
+ if (event instanceof CamelContextStoppedEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextStoppedEvent context = (CamelContextStoppedEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ post = true;
+ }
+ if (event instanceof CamelContextStoppingEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextStoppingEvent context = (CamelContextStoppingEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ post = true;
+ }
+ if (event instanceof CamelContextSuspendedEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextSuspendedEvent context = (CamelContextSuspendedEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ post = true;
+ }
+ if (event instanceof CamelContextSuspendingEvent && !isIgnoreCamelContextEvents()) {
+ CamelContextSuspendingEvent context = (CamelContextSuspendingEvent) event;
+ eventMap.put("camelContextName", context.getContext().getName());
+ post = true;
+ }
+ if (event instanceof ExchangeCompletedEvent && !isIgnoreExchangeEvents() && !isIgnoreExchangeCompletedEvent()) {
+ post = true;
+ }
+ if (event instanceof ExchangeCreatedEvent && !isIgnoreExchangeEvents() && !isIgnoreExchangeCreatedEvent()) {
+ post = true;
+ }
+ if (post) {
+ eventAdmin.postEvent(new Event("decanter/collect/camel/event", eventMap));
+ }
+ } catch (Exception ex) {
+ LOG.warn("Failed to handle event", ex);
+ }
+ }
+
+ protected void doStart() throws Exception {
+ }
+
+ protected void doStop() throws Exception {
+ }
+
+ private Map<String, Object> createEvent(EventObject event, Exchange exchange) throws UnknownHostException {
+ HashMap<String, Object> data = new HashMap<String, Object>();
+ data.put("eventType", event.getClass().getName());
+ data.put("type", "camelEvent");
+ data.put("karafName", System.getProperty("karaf.name"));
+ data.put("hostAddress", InetAddress.getLocalHost().getHostAddress());
+ data.put("hostName", InetAddress.getLocalHost().getHostName());
+ data.put("timestamp", System.currentTimeMillis());
+
+ if (exchange == null) {
+ return data;
+ }
+ data.put("fromEndpointUri", exchange.getFromEndpoint() != null ? exchange.getFromEndpoint().getEndpointUri() : null);
+ data.put("previousNode", extractFromNode(exchange));
+ data.put("toNode", extractToNode(exchange));
+ data.put("exchangeId", exchange.getExchangeId());
+ data.put("routeId", exchange.getFromRouteId());
+ data.put("camelContextName", exchange.getContext().getName());
+ data.put("shortExchangeId", extractShortExchangeId(exchange));
+ data.put("exchangePattern", exchange.getPattern().toString());
+ data.put("properties", exchange.getProperties());
+ data.put("inHeaders", exchange.getIn().getHeaders());
+ data.put("inBody", MessageHelper.extractBodyAsString(exchange.getIn()));
+ data.put("inBodyType", MessageHelper.getBodyTypeName(exchange.getIn()));
+ if (exchange.hasOut()) {
+ data.put("outHeaders", exchange.getOut().getHeaders());
+ data.put("outBody", MessageHelper.extractBodyAsString(exchange.getOut()));
+ data.put("outBodyType", MessageHelper.getBodyTypeName(exchange.getOut()));
+ }
+ data.put("causedByException", extractCausedByException(exchange));
+ if (extender != null) {
+ extender.extend(data, exchange);
+ }
+ return data;
+ }
+
+ private static String extractShortExchangeId(Exchange exchange) {
+ return exchange.getExchangeId().substring(exchange.getExchangeId().indexOf("/") + 1);
+ }
+
+ private static String extractFromNode(Exchange exchange) {
+ if (exchange.getUnitOfWork() == null) {
+ return null;
+ }
+ TracedRouteNodes traced = exchange.getUnitOfWork().getTracedRouteNodes();
+ RouteNode last = traced.getSecondLastNode();
+ return last != null ? last.getLabel(exchange) : null;
+ }
+
+ private static String extractToNode(Exchange exchange) {
+ if (exchange.getUnitOfWork() == null) {
+ return null;
+ }
+ TracedRouteNodes traced = exchange.getUnitOfWork().getTracedRouteNodes();
+ RouteNode last = traced.getLastNode();
+ return last != null ? last.getLabel(exchange) : null;
+ }
+
+ private static String extractCausedByException(Exchange exchange) {
+ Throwable cause = exchange.getException();
+ if (cause == null) {
+ cause = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class);
+ }
+ return (cause != null) ? cause.toString() : null;
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
----------------------------------------------------------------------
diff --git a/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
new file mode 100644
index 0000000..a1602ee
--- /dev/null
+++ b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
@@ -0,0 +1,138 @@
+/*
+ * 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.karaf.decanter.collector.camel;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.RouteNode;
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.processor.interceptor.TraceEventHandler;
+import org.apache.camel.processor.interceptor.TraceInterceptor;
+import org.apache.camel.spi.TracedRouteNodes;
+import org.apache.camel.util.MessageHelper;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventAdmin;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+
+public class DecanterTraceEventHandler implements TraceEventHandler {
+
+ private EventAdmin eventAdmin;
+ private DecanterCamelEventExtender extender = null;
+
+ public DecanterTraceEventHandler() {
+ }
+
+ public EventAdmin getEventAdmin() {
+ return eventAdmin;
+ }
+
+ public void setExtender(DecanterCamelEventExtender extender) {
+ this.extender = extender;
+ }
+
+ public void setEventAdmin(EventAdmin eventAdmin) {
+ this.eventAdmin = eventAdmin;
+ }
+
+ @Override
+ public void traceExchange(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("type", "camelTracer");
+ data.put("karafName", System.getProperty("karaf.name"));
+ data.put("hostAddress", InetAddress.getLocalHost().getHostAddress());
+ data.put("hostName", InetAddress.getLocalHost().getHostName());
+ data.put("nodeId", node.getId());
+ data.put("timestamp", System.currentTimeMillis());
+ data.put("fromEndpointUri", exchange.getFromEndpoint() != null ? exchange.getFromEndpoint().getEndpointUri() : null);
+ data.put("previousNode", extractFromNode(exchange));
+ data.put("toNode", extractToNode(exchange));
+ data.put("exchangeId", exchange.getExchangeId());
+ data.put("routeId", exchange.getFromRouteId());
+ data.put("camelContextName", exchange.getContext().getName());
+ data.put("shortExchangeId", extractShortExchangeId(exchange));
+ data.put("exchangePattern", exchange.getPattern().toString());
+ for (String property : exchange.getProperties().keySet()) {
+ if (property.startsWith("decanter.")) {
+ data.put(property.substring("decanter.".length()), exchange.getProperties().get(property));
+ }
+ }
+ data.put("properties", exchange.getProperties().isEmpty() ? null : exchange.getProperties());
+ for (String header : exchange.getIn().getHeaders().keySet()) {
+ if (header.startsWith("decanter.")) {
+ data.put(header.substring("decanter.".length()), exchange.getIn().getHeader(header));
+ }
+ }
+ data.put("inHeaders", exchange.getIn().getHeaders().isEmpty() ? null : exchange.getIn().getHeaders());
+ data.put("inBody", MessageHelper.extractBodyAsString(exchange.getIn()));
+ data.put("inBodyType", MessageHelper.getBodyTypeName(exchange.getIn()));
+ if (exchange.hasOut()) {
+ data.put("outHeaders", exchange.getOut().getHeaders().isEmpty() ? null : exchange.getOut().getHeaders());
+ data.put("outBody", MessageHelper.extractBodyAsString(exchange.getOut()));
+ data.put("outBodyType", MessageHelper.getBodyTypeName(exchange.getOut()));
+ }
+ data.put("causedByException", extractCausedByException(exchange));
+ if (extender != null) {
+ extender.extend(data, exchange);
+ }
+ Event event = new Event("decanter/collect/camel/tracer", data);
+ eventAdmin.postEvent(event);
+ }
+
+ @Override
+ public Object traceExchangeIn(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
+ traceExchange(node, target, traceInterceptor, exchange);
+ return null;
+ }
+
+ @Override
+ public void traceExchangeOut(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception {
+ traceExchange(node, target, traceInterceptor, exchange);
+ }
+
+ private static String extractShortExchangeId(Exchange exchange) {
+ return exchange.getExchangeId().substring(exchange.getExchangeId().indexOf("/") + 1);
+ }
+
+ private static String extractFromNode(Exchange exchange) {
+ if (exchange.getUnitOfWork() == null) {
+ return null;
+ }
+ TracedRouteNodes traced = exchange.getUnitOfWork().getTracedRouteNodes();
+ RouteNode last = traced.getSecondLastNode();
+ return last != null ? last.getLabel(exchange) : null;
+ }
+
+ private static String extractToNode(Exchange exchange) {
+ if (exchange.getUnitOfWork() == null) {
+ return null;
+ }
+ TracedRouteNodes traced = exchange.getUnitOfWork().getTracedRouteNodes();
+ RouteNode last = traced.getLastNode();
+ return last != null ? last.getLabel(exchange) : null;
+ }
+
+ private static String extractCausedByException(Exchange exchange) {
+ Throwable cause = exchange.getException();
+ if (cause == null) {
+ cause = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class);
+ }
+ return (cause != null) ? cause.toString() : null;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
----------------------------------------------------------------------
diff --git a/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
new file mode 100644
index 0000000..0a04e4e
--- /dev/null
+++ b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifierTest.java
@@ -0,0 +1,240 @@
+/*
+ * 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.karaf.decanter.collector.camel;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.management.event.*;
+import org.junit.Assert;
+import org.junit.Test;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventAdmin;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class DecanterEventNotifierTest {
+
+ @Test
+ public void testEventNotifier() throws Exception {
+ DispatcherMock eventAdmin = new DispatcherMock();
+ DecanterEventNotifier notifier = new DecanterEventNotifier();
+ notifier.setEventAdmin(eventAdmin);
+
+ RouteBuilder builder = new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("test-route").to("log:foo");
+ }
+ };
+
+ DefaultCamelContext camelContext = new DefaultCamelContext();
+ camelContext.setName("test-context");
+ camelContext.addRoutes(builder);
+ camelContext.getManagementStrategy().addEventNotifier(notifier);
+ camelContext.start();
+
+ ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
+ producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
+
+ Assert.assertEquals(10, eventAdmin.getPostEvents().size());
+
+ Event camelContextStartingEvent = eventAdmin.getPostEvents().get(0);
+ Assert.assertEquals("test-context", camelContextStartingEvent.getProperty("camelContextName"));
+ Assert.assertEquals(CamelContextStartingEvent.class.getName(), camelContextStartingEvent.getProperty("eventType"));
+ Assert.assertEquals("camelEvent", camelContextStartingEvent.getProperty("type"));
+
+ Event routeAddedEvent = eventAdmin.getPostEvents().get(1);
+ Assert.assertEquals("test-context", routeAddedEvent.getProperty("camelContextName"));
+ Assert.assertEquals("test-route", routeAddedEvent.getProperty("routeId"));
+ Assert.assertEquals(RouteAddedEvent.class.getName(), routeAddedEvent.getProperty("eventType"));
+ Assert.assertEquals("camelEvent", routeAddedEvent.getProperty("type"));
+
+ Event routeStartedEvent = eventAdmin.getPostEvents().get(2);
+ Assert.assertEquals("test-context", routeStartedEvent.getProperty("camelContextName"));
+ Assert.assertEquals("test-route", routeStartedEvent.getProperty("routeId"));
+ Assert.assertEquals(RouteStartedEvent.class.getName(), routeStartedEvent.getProperty("eventType"));
+ Assert.assertEquals("camelEvent", routeStartedEvent.getProperty("type"));
+
+ Event camelContextStartedEvent = eventAdmin.getPostEvents().get(3);
+ Assert.assertEquals("test-context", camelContextStartedEvent.getProperty("camelContextName"));
+ Assert.assertEquals(CamelContextStartedEvent.class.getName(), camelContextStartedEvent.getProperty("eventType"));
+ Assert.assertEquals("camelEvent", camelContextStartedEvent.getProperty("type"));
+
+ Event exchangeSendingEvent = eventAdmin.getPostEvents().get(4);
+ Assert.assertEquals("test-context", exchangeSendingEvent.getProperty("camelContextName"));
+ Assert.assertEquals(ExchangeSendingEvent.class.getName(), exchangeSendingEvent.getProperty("eventType"));
+ Assert.assertEquals("camelEvent", exchangeSendingEvent.getProperty("type"));
+ Assert.assertEquals("InOnly", exchangeSendingEvent.getProperty("exchangePattern"));
+ Assert.assertEquals("direct://start", exchangeSendingEvent.getProperty("sendingToEndpointUri"));
+ Assert.assertEquals("TEST", exchangeSendingEvent.getProperty("inBody"));
+
+ Event exchangeCreatedEvent = eventAdmin.getPostEvents().get(5);
+ Assert.assertEquals("test-context", exchangeCreatedEvent.getProperty("camelContextName"));
+ Assert.assertEquals(ExchangeCreatedEvent.class.getName(), exchangeCreatedEvent.getProperty("eventType"));
+ Assert.assertEquals("camelEvent", exchangeCreatedEvent.getProperty("type"));
+ Assert.assertEquals("InOnly", exchangeCreatedEvent.getProperty("exchangePattern"));
+ Assert.assertEquals("TEST", exchangeCreatedEvent.getProperty("inBody"));
+ }
+
+ @Test
+ public void testCamelContextFilter() throws Exception {
+ DispatcherMock eventAdmin = new DispatcherMock();
+ DecanterEventNotifier notifier = new DecanterEventNotifier();
+ notifier.setEventAdmin(eventAdmin);
+ notifier.setCamelContextMatcher("foo");
+
+ RouteBuilder builder = new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("test-route").to("log:foo");
+ }
+ };
+
+ DefaultCamelContext camelContext = new DefaultCamelContext();
+ camelContext.setName("test-context");
+ camelContext.addRoutes(builder);
+ camelContext.getManagementStrategy().addEventNotifier(notifier);
+ camelContext.start();
+
+ ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
+ producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
+
+ Assert.assertEquals(0, eventAdmin.getPostEvents().size());
+ }
+
+ @Test
+ public void testRouteIdFilter() throws Exception {
+ DispatcherMock eventAdmin = new DispatcherMock();
+ DecanterEventNotifier notifier = new DecanterEventNotifier();
+ notifier.setEventAdmin(eventAdmin);
+ notifier.setCamelContextMatcher(".*");
+ notifier.setRouteMatcher("foo");
+
+ RouteBuilder builder = new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("test-route").to("log:foo");
+ }
+ };
+
+ DefaultCamelContext camelContext = new DefaultCamelContext();
+ camelContext.setName("test-context");
+ camelContext.addRoutes(builder);
+ camelContext.getManagementStrategy().addEventNotifier(notifier);
+ camelContext.start();
+
+ ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
+ producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
+
+ Assert.assertEquals(4, eventAdmin.getPostEvents().size());
+ }
+
+ @Test
+ public void testIgnoredEvents() throws Exception {
+ DispatcherMock eventAdmin = new DispatcherMock();
+ DecanterEventNotifier notifier = new DecanterEventNotifier();
+ notifier.setEventAdmin(eventAdmin);
+ notifier.setIgnoreCamelContextEvents(true);
+
+ RouteBuilder builder = new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("test-route").to("log:foo");
+ }
+ };
+
+ DefaultCamelContext camelContext = new DefaultCamelContext();
+ camelContext.setName("test-context");
+ camelContext.addRoutes(builder);
+ camelContext.getManagementStrategy().addEventNotifier(notifier);
+ camelContext.start();
+
+ ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
+ producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
+
+ Assert.assertEquals(8, eventAdmin.getPostEvents().size());
+ }
+
+ @Test
+ public void testExtender() throws Exception {
+ DispatcherMock eventAdmin = new DispatcherMock();
+ DecanterEventNotifier notifier = new DecanterEventNotifier();
+ notifier.setIgnoreCamelContextEvents(true);
+ notifier.setIgnoreRouteEvents(true);
+ notifier.setEventAdmin(eventAdmin);
+ notifier.setExtender(new TestExtender());
+
+ RouteBuilder builder = new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("test-route").to("log:foo");
+ }
+ };
+
+ DefaultCamelContext camelContext = new DefaultCamelContext();
+ camelContext.setName("test-context");
+ camelContext.addRoutes(builder);
+ camelContext.getManagementStrategy().addEventNotifier(notifier);
+ camelContext.start();
+
+ ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
+ producerTemplate.sendBodyAndHeader("direct:start", "TEST", "foo", "bar");
+
+ Assert.assertEquals(6, eventAdmin.getPostEvents().size());
+
+ Assert.assertEquals("test", eventAdmin.getPostEvents().get(0).getProperty("extender-test"));
+ }
+
+ private class DispatcherMock implements EventAdmin {
+
+ private List<Event> postEvents = new ArrayList<>();
+ private List<Event> sendEvents = new ArrayList<>();
+
+ @Override
+ public void postEvent(Event event) {
+ postEvents.add(event);
+ }
+
+ @Override
+ public void sendEvent(Event event) {
+ System.out.println("SEND EVENT");
+ sendEvents.add(event);
+ }
+
+ public List<Event> getPostEvents() {
+ return postEvents;
+ }
+
+ public List<Event> getSendEvents() {
+ return sendEvents;
+ }
+ }
+
+ private class TestExtender implements DecanterCamelEventExtender {
+
+ @Override
+ public void extend(Map<String, Object> decanterData, Exchange camelExchange) {
+ decanterData.put("extender-test", "test");
+ }
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandlerTest.java
----------------------------------------------------------------------
diff --git a/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandlerTest.java b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandlerTest.java
new file mode 100644
index 0000000..7d8aa6f
--- /dev/null
+++ b/collector/camel/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandlerTest.java
@@ -0,0 +1,161 @@
+/*
+ * 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.karaf.decanter.collector.camel;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.processor.interceptor.Tracer;
+import org.apache.karaf.decanter.marshaller.json.JsonMarshaller;
+import org.junit.Assert;
+import org.junit.Test;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventAdmin;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class DecanterTraceEventHandlerTest {
+
+ @Test
+ public void testTracer() throws Exception {
+ JsonMarshaller marshaller = new JsonMarshaller();
+
+ DispatcherMock eventAdmin = new DispatcherMock();
+
+ RouteBuilder builder = new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("test-route").to("log:foo");
+ }
+ };
+ DefaultCamelContext camelContext = new DefaultCamelContext();
+ camelContext.setName("test-context");
+ camelContext.addRoutes(builder);
+ Tracer tracer = new Tracer();
+ tracer.setEnabled(true);
+ tracer.setTraceOutExchanges(true);
+ tracer.setLogLevel(LoggingLevel.OFF);
+ DecanterTraceEventHandler handler = new DecanterTraceEventHandler();
+ handler.setEventAdmin(eventAdmin);
+ tracer.addTraceHandler(handler);
+ camelContext.setTracing(true);
+ camelContext.setDefaultTracer(tracer);
+ camelContext.start();
+
+ ProducerTemplate template = camelContext.createProducerTemplate();
+ template.sendBodyAndHeader("direct:start", "TEST", "header", "test");
+
+ for (Event event : eventAdmin.getPostEvents()) {
+ String jsonString = marshaller.marshal(event);
+ JsonReader jsonReader = Json.createReader(new StringReader(jsonString));
+ JsonObject rootObject = jsonReader.readObject();
+ Assert.assertEquals("InOnly", rootObject.getString("exchangePattern"));
+ Assert.assertEquals("camelTracer", rootObject.getString("type"));
+ Assert.assertEquals("log://foo", rootObject.getString("toNode"));
+ Assert.assertEquals("test-route", rootObject.getString("routeId"));
+ Assert.assertEquals("test-context", rootObject.getString("camelContextName"));
+ JsonObject headersObject = rootObject.getJsonObject("inHeaders");
+ Assert.assertEquals("test", headersObject.getString("header"));
+ Assert.assertEquals("direct://start", rootObject.getString("fromEndpointUri"));
+ Assert.assertEquals("TEST", rootObject.getString("inBody"));
+ JsonObject propertiesObject = rootObject.getJsonObject("properties");
+ Assert.assertEquals("log://foo", propertiesObject.getString("CamelToEndpoint"));
+ Assert.assertEquals("String", rootObject.getString("inBodyType"));
+ Assert.assertEquals("decanter/collect/camel/tracer", rootObject.getString("event_topics"));
+ System.out.println(marshaller.marshal(event));
+ }
+ }
+
+ @Test
+ public void testTracerWithExtender() throws Exception {
+ DispatcherMock eventAdmin = new DispatcherMock();
+
+ TestExtender extender = new TestExtender();
+
+ RouteBuilder builder = new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("test-route").to("log:foo");
+ }
+ };
+ DefaultCamelContext camelContext = new DefaultCamelContext();
+ camelContext.setName("test-context");
+ camelContext.addRoutes(builder);
+ Tracer tracer = new Tracer();
+ tracer.setEnabled(true);
+ tracer.setTraceOutExchanges(true);
+ tracer.setLogLevel(LoggingLevel.OFF);
+ DecanterTraceEventHandler handler = new DecanterTraceEventHandler();
+ handler.setExtender(extender);
+ handler.setEventAdmin(eventAdmin);
+ tracer.addTraceHandler(handler);
+ camelContext.setTracing(true);
+ camelContext.setDefaultTracer(tracer);
+ camelContext.start();
+
+ ProducerTemplate template = camelContext.createProducerTemplate();
+ template.sendBodyAndHeader("direct:start", "TEST", "header", "test");
+
+ Assert.assertEquals(2, eventAdmin.getPostEvents().size());
+
+ Assert.assertEquals("test", eventAdmin.getPostEvents().get(0).getProperty("extender-test"));
+ Assert.assertEquals("test", eventAdmin.getPostEvents().get(1).getProperty("extender-test"));
+ }
+
+ private class DispatcherMock implements EventAdmin {
+
+ private List<Event> postEvents = new ArrayList<>();
+ private List<Event> sendEvents = new ArrayList<>();
+
+ @Override
+ public void postEvent(Event event) {
+ postEvents.add(event);
+ }
+
+ @Override
+ public void sendEvent(Event event) {
+ System.out.println("SEND EVENT");
+ sendEvents.add(event);
+ }
+
+ public List<Event> getPostEvents() {
+ return postEvents;
+ }
+
+ public List<Event> getSendEvents() {
+ return sendEvents;
+ }
+ }
+
+ private class TestExtender implements DecanterCamelEventExtender {
+
+ @Override
+ public void extend(Map<String, Object> decanterData, Exchange camelExchange) {
+ decanterData.put("extender-test", "test");
+ }
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/src/test/resources/sample.xml
----------------------------------------------------------------------
diff --git a/collector/camel/src/test/resources/sample.xml b/collector/camel/src/test/resources/sample.xml
new file mode 100644
index 0000000..935e614
--- /dev/null
+++ b/collector/camel/src/test/resources/sample.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <reference id="eventAdmin" interface="org.osgi.service.event.EventAdmin"/>
+
+ <bean id="traceHandler" class="org.apache.karaf.decanter.collector.camel.DecanterTraceEventHandler">
+ <property name="eventAdmin" ref="eventAdmin"/>
+ </bean>
+
+ <bean id="tracer" class="org.apache.camel.processor.interceptor.Tracer">
+ <property name="traceHandler" ref="traceHandler"/>
+ <property name="enabled" value="true"/>
+ <property name="traceOutExchanges" value="true"/>
+ <property name="logLevel" value="OFF"/>
+ </bean>
+
+ <camelContext trace="true" xmlns="http://camel.apache.org/schema/blueprint">
+ <route id="test">
+ <from uri="timer:fire?period=10000"/>
+ <setBody><constant>Hello World</constant></setBody>
+ <to uri="log:test"/>
+ </route>
+ </camelContext>
+
+</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/pom.xml
----------------------------------------------------------------------
diff --git a/collector/pom.xml b/collector/pom.xml
index a4a40d5..505e1e1 100644
--- a/collector/pom.xml
+++ b/collector/pom.xml
@@ -37,7 +37,7 @@
<module>jmx</module>
<module>log</module>
<module>file</module>
- <module>camel-tracer</module>
+ <module>camel</module>
<module>system</module>
<module>log4j-socket</module>
<module>rest</module>
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/manual/src/main/asciidoc/user-guide/collectors.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/collectors.adoc b/manual/src/main/asciidoc/user-guide/collectors.adoc
index 7dcb32b..c236409 100644
--- a/manual/src/main/asciidoc/user-guide/collectors.adoc
+++ b/manual/src/main/asciidoc/user-guide/collectors.adoc
@@ -249,7 +249,7 @@ The ActiveMQ JMX collector is just a special configuration of the JMX collector.
The `decanter-collector-activemq` feature installs the default JMX collector, with the specific ActiveMQ JMX configuration:
----
-karaf@root()> feature:install decanter-collector-activemq
+karaf@root()> feature:install decanter-collector-jmx-activemq
----
This feature installs the same collector as the `decanter-collector-jmx`, but also add the
@@ -287,10 +287,10 @@ This configuration actually contains a filter to retrieve only the ActiveMQ JMX
The Camel JMX collector is just a special configuration of the JMX collector.
-The `decanter-collector-camel` feature installs the default JMX collector, with the specific Camel JMX configuration:
+The `decanter-collector-jmx-camel` feature installs the default JMX collector, with the specific Camel JMX configuration:
----
-karaf@root()> feature:install decanter-collector-camel
+karaf@root()> feature:install decanter-collector-jmx-camel
----
This feature installs the same collector as the `decanter-collector-jmx`, but also add the
@@ -324,17 +324,19 @@ object.name=org.apache.camel:context=*,type=routes,name=*
This configuration actually contains a filter to retrieve only the Camel Routes JMX MBeans.
-==== Camel Tracer
+==== Camel Tracer & Notifier
+
+Decanter provides a Camel Tracer Handler that you can set on a Camel Tracer. It also provides a Camel Event Notifier.
-The Camel Tracer provides a Camel Tracer Handler that you can set on a Camel Tracer.
+===== Camel Tracer
If you enable the tracer on a Camel route, all tracer events (exchanges on each step of the route) are send to the
appenders.
-The `decanter-collector-camel-tracer` feature provides the Camel Tracer Handler:
+The `decanter-collector-camel` feature provides the Camel Tracer Handler:
----
-karaf@root()> feature:install decanter-collector-camel-tracer
+karaf@root()> feature:install decanter-collector-camel
----
Now, you can use the Decanter Camel Tracer Handler in a tracer that you can use in routes.
@@ -370,6 +372,25 @@ in the Camel Tracer:
</blueprint>
----
+You can extend the Decanter event with any property using a custom `DecanterCamelEventExtender`:
+
+----
+public interface DecanterCamelEventExtender {
+
+ void extend(Map<String, Object> decanterData, Exchange camelExchange);
+
+}
+----
+
+You can inject your extender using `setExtender(myExtender)` on the `DecanterTraceEventHandler`. Decanter will automatically
+call your extender to populate extra properties.
+
+===== Camel Event Notifier
+
+Decanter also provides `DecanterEventNotifier` implementing a Camel event notifier: http://camel.apache.org/eventnotifier-to-log-details-about-all-sent-exchanges.html
+
+It's very similar to the Decanter Camel Tracer. You can control the camel contexts and routes to which you want to trap event.
+
==== System
The system collector is a polled collector (periodically executed by the Decanter Scheduler).
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ab91837..0babd1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<baseline.skip>true</baseline.skip>
<activemq.version>5.13.3</activemq.version>
- <camel.version>2.13.2</camel.version>
+ <camel.version>2.16.2</camel.version>
<cassandra.version>2.2.4</cassandra.version>
<cassandra.driver.version>2.2.0-rc1</cassandra.driver.version>
<elasticsearch1.version>1.7.4</elasticsearch1.version>
[2/2] karaf-decanter git commit: [KARAF-5033] Improve the Camel
Tracer and add Camel Event Notifier
Posted by jb...@apache.org.
[KARAF-5033] Improve the Camel Tracer and add Camel Event Notifier
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/a3d3ea29
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/a3d3ea29
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/a3d3ea29
Branch: refs/heads/master
Commit: a3d3ea29aae0cbc4676be8e12610322d35de925d
Parents: 4e53beb
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Jul 15 22:46:50 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Jul 15 22:46:50 2017 +0200
----------------------------------------------------------------------
README | 4 +-
assembly/src/main/feature/feature.xml | 8 +-
collector/camel-tracer/LICENSE | 475 -------------------
collector/camel-tracer/NOTICE | 36 --
collector/camel-tracer/pom.xml | 72 ---
.../camel/DecanterTraceEventHandler.java | 129 -----
.../camel/DecanterTraceEventHandlerTest.java | 114 -----
.../camel-tracer/src/test/resources/sample.xml | 25 -
collector/camel/LICENSE | 475 +++++++++++++++++++
collector/camel/NOTICE | 36 ++
collector/camel/pom.xml | 72 +++
.../camel/DecanterCamelEventExtender.java | 30 ++
.../collector/camel/DecanterEventNotifier.java | 346 ++++++++++++++
.../camel/DecanterTraceEventHandler.java | 138 ++++++
.../camel/DecanterEventNotifierTest.java | 240 ++++++++++
.../camel/DecanterTraceEventHandlerTest.java | 161 +++++++
collector/camel/src/test/resources/sample.xml | 25 +
collector/pom.xml | 2 +-
.../main/asciidoc/user-guide/collectors.adoc | 35 +-
pom.xml | 2 +-
20 files changed, 1559 insertions(+), 866 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/README
----------------------------------------------------------------------
diff --git a/README b/README
index 5da2e81..a3ac53e 100644
--- a/README
+++ b/README
@@ -71,9 +71,9 @@ Collectors
* decanter-collector-jmx
* decanter-collector-kafka
* decanter-collector-rest
-* decanter-collector-activemq
+* decanter-collector-jmx-activemq
+* decanter-collector-jmx-camel
* decanter-collector-camel
-* decanter-collector-camel-tracer
* decanter-collector-mqtt
* decanter-collector-rest
* decanter-collector-rest-servlet
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/assembly/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 217c77d..748bccb 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -67,19 +67,19 @@
<configfile finalname="/etc/org.apache.karaf.decanter.collector.jmx-local.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.jmx/${project.version}/cfg/local</configfile>
</feature>
- <feature name="decanter-collector-camel" version="${project.version}" description="Karaf Decanter Camel Collector">
+ <feature name="decanter-collector-jmx-camel" version="${project.version}" description="Karaf Decanter Camel JMX Collector">
<feature version="${project.version}">decanter-collector-jmx-core</feature>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.jmx-camel.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.jmx/${project.version}/cfg/camel</configfile>
</feature>
- <feature name="decanter-collector-activemq" version="${project.version}" description="Karaf Decanter ActiveMQ Collector">
+ <feature name="decanter-collector-jmx-activemq" version="${project.version}" description="Karaf Decanter ActiveMQ JMX Collector">
<feature version="${project.version}">decanter-collector-jmx-core</feature>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.jmx-activemq.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.jmx/${project.version}/cfg/activemq</configfile>
</feature>
- <feature name="decanter-collector-camel-tracer" version="${project.version}" description="Karaf Decanter Camel Tracer Collector">
+ <feature name="decanter-collector-camel" version="${project.version}" description="Karaf Decanter Camel Collector">
<feature>decanter-common</feature>
- <bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.camel-tracer/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.camel/${project.version}</bundle>
</feature>
<feature name="decanter-collector-rest-core" version="${project.version}" description="Karaf Decanter REST Collector core">
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel-tracer/LICENSE
----------------------------------------------------------------------
diff --git a/collector/camel-tracer/LICENSE b/collector/camel-tracer/LICENSE
deleted file mode 100644
index b36a53d..0000000
--- a/collector/camel-tracer/LICENSE
+++ /dev/null
@@ -1,475 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-For asm:
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-For equinox:
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT").
-ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
-A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
-modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale
-of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code
-and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer
-the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to
-the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall
-not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
-based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights
-needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program,
-it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any,
-to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain
-it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably
-allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor
-("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims,
-lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused
-by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a
-commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any
-actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly
-notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and
-cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption
-of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity
-or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto,
-such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes
-such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the
-Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right
-to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement
-Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse
-Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new
-version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may
-always be distributed subject to the version of the Agreement under which it was received. In addition, after a new
-version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions)
-under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
-licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication,
-estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the
-cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
-For Java Service Wrapper:
-Copyright (c) 1999, 2006 Tanuki Software, Inc.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of the Java Service Wrapper and associated
-documentation files (the "Software"), to deal in the Software
-without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sub-license,
-and/or sell copies of the Software, and to permit persons to
-whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-
-Portions of the Software have been derived from source code
-developed by Silver Egg Technology under the following license:
-
-BEGIN Silver Egg Techology License -----------------------------------
-
- Copyright (c) 2001 Silver Egg Technology
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sub-license, and/or
- sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-END Silver Egg Techology License -------------------------------------
-
-For slf4j
-Copyright (c) 2004-2011 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel-tracer/NOTICE
----------------------------------------------------------------------
diff --git a/collector/camel-tracer/NOTICE b/collector/camel-tracer/NOTICE
deleted file mode 100644
index aeef0e0..0000000
--- a/collector/camel-tracer/NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-Apache Karaf Decanter
-Copyright 2015 The Apache Software Foundation
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-Elastic (https://www.elastic.co/).
-Licensed under the Apache License 2.0.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product uses software developed at
-JUnit (http://www.junit.org/).
-Licensed under the Eclipse Public License 1.0.
-
-III. License Summary
-- Apache License 2.0
-- MIT License
-- Eclipse Public License 1.0
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel-tracer/pom.xml
----------------------------------------------------------------------
diff --git a/collector/camel-tracer/pom.xml b/collector/camel-tracer/pom.xml
deleted file mode 100644
index 7903c7e..0000000
--- a/collector/camel-tracer/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.karaf.decanter</groupId>
- <artifactId>collector</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.karaf.decanter.collector</groupId>
- <artifactId>org.apache.karaf.decanter.collector.camel-tracer</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: Decanter :: Collector :: Camel Tracer</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
- </dependency>
-
- <!-- test -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.22</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.decanter.marshaller</groupId>
- <artifactId>org.apache.karaf.decanter.marshaller.json</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.karaf.decanter.collector.camel
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel-tracer/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
----------------------------------------------------------------------
diff --git a/collector/camel-tracer/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java b/collector/camel-tracer/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
deleted file mode 100644
index 82ba378..0000000
--- a/collector/camel-tracer/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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.karaf.decanter.collector.camel;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.RouteNode;
-import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.processor.interceptor.TraceEventHandler;
-import org.apache.camel.processor.interceptor.TraceInterceptor;
-import org.apache.camel.spi.TracedRouteNodes;
-import org.apache.camel.util.MessageHelper;
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventAdmin;
-
-import java.net.InetAddress;
-import java.util.HashMap;
-
-public class DecanterTraceEventHandler implements TraceEventHandler {
-
- private EventAdmin eventAdmin;
-
- public DecanterTraceEventHandler() {
- }
-
- public EventAdmin getEventAdmin() {
- return eventAdmin;
- }
-
- public void setEventAdmin(EventAdmin eventAdmin) {
- this.eventAdmin = eventAdmin;
- }
-
- @Override
- public void traceExchange(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
- HashMap<String, Object> data = new HashMap<>();
- data.put("type", "camelTracer");
- data.put("karafName", System.getProperty("karaf.name"));
- data.put("hostAddress", InetAddress.getLocalHost().getHostAddress());
- data.put("hostName", InetAddress.getLocalHost().getHostName());
- data.put("nodeId", node.getId());
- data.put("timestamp", System.currentTimeMillis());
- data.put("fromEndpointUri", exchange.getFromEndpoint() != null ? exchange.getFromEndpoint().getEndpointUri() : null);
- data.put("previousNode", extractFromNode(exchange));
- data.put("toNode", extractToNode(exchange));
- data.put("exchangeId", exchange.getExchangeId());
- data.put("routeId", exchange.getFromRouteId());
- data.put("shortExchangeId", extractShortExchangeId(exchange));
- data.put("exchangePattern", exchange.getPattern().toString());
- for (String property : exchange.getProperties().keySet()) {
- if (property.startsWith("decanter.")) {
- data.put(property.substring("decanter.".length()), exchange.getProperties().get(property));
- }
- }
- data.put("properties", exchange.getProperties().isEmpty() ? null : exchange.getProperties());
- for (String header : exchange.getIn().getHeaders().keySet()) {
- if (header.startsWith("decanter.")) {
- data.put(header.substring("decanter.".length()), exchange.getIn().getHeader(header));
- }
- }
- data.put("inHeaders", exchange.getIn().getHeaders().isEmpty() ? null : exchange.getIn().getHeaders());
- data.put("inBody", MessageHelper.extractBodyAsString(exchange.getIn()));
- data.put("inBodyType", MessageHelper.getBodyTypeName(exchange.getIn()));
- if (exchange.hasOut()) {
- data.put("outHeaders", exchange.getOut().getHeaders().isEmpty() ? null : exchange.getOut().getHeaders());
- data.put("outBody", MessageHelper.extractBodyAsString(exchange.getOut()));
- data.put("outBodyType", MessageHelper.getBodyTypeName(exchange.getOut()));
- }
- data.put("causedByException", extractCausedByException(exchange));
- Event event = new Event("decanter/collect/camel/tracer", data);
- eventAdmin.postEvent(event);
- }
-
- @Override
- public Object traceExchangeIn(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange) throws Exception {
- traceExchange(node, target, traceInterceptor, exchange);
- return null;
- }
-
- @Override
- public void traceExchangeOut(ProcessorDefinition<?> node, Processor target, TraceInterceptor traceInterceptor, Exchange exchange, Object traceState) throws Exception {
- traceExchange(node, target, traceInterceptor, exchange);
- }
-
- private static String extractShortExchangeId(Exchange exchange) {
- return exchange.getExchangeId().substring(exchange.getExchangeId().indexOf("/") + 1);
- }
-
- private static String extractFromNode(Exchange exchange) {
- if (exchange.getUnitOfWork() == null) {
- return null;
- }
- TracedRouteNodes traced = exchange.getUnitOfWork().getTracedRouteNodes();
- RouteNode last = traced.getSecondLastNode();
- return last != null ? last.getLabel(exchange) : null;
- }
-
- private static String extractToNode(Exchange exchange) {
- if (exchange.getUnitOfWork() == null) {
- return null;
- }
- TracedRouteNodes traced = exchange.getUnitOfWork().getTracedRouteNodes();
- RouteNode last = traced.getLastNode();
- return last != null ? last.getLabel(exchange) : null;
- }
-
- private static String extractCausedByException(Exchange exchange) {
- Throwable cause = exchange.getException();
- if (cause == null) {
- cause = exchange.getProperty(Exchange.EXCEPTION_CAUGHT, Throwable.class);
- }
- return (cause != null) ? cause.toString() : null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel-tracer/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandlerTest.java
----------------------------------------------------------------------
diff --git a/collector/camel-tracer/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandlerTest.java b/collector/camel-tracer/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandlerTest.java
deleted file mode 100644
index a4e9e6c..0000000
--- a/collector/camel-tracer/src/test/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandlerTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * 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.karaf.decanter.collector.camel;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.LoggingLevel;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.processor.interceptor.Tracer;
-import org.apache.karaf.decanter.marshaller.json.JsonMarshaller;
-import org.junit.Assert;
-import org.junit.Test;
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventAdmin;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
-public class DecanterTraceEventHandlerTest {
-
- @Test
- public void testTracer() throws Exception {
- JsonMarshaller marshaller = new JsonMarshaller();
-
- DispatcherMock eventAdmin = new DispatcherMock();
-
- RouteBuilder builder = new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start").id("testRoute").to("log:foo");
- }
- };
- CamelContext camelContext = new DefaultCamelContext();
- camelContext.addRoutes(builder);
- Tracer tracer = new Tracer();
- tracer.setEnabled(true);
- tracer.setTraceOutExchanges(true);
- tracer.setLogLevel(LoggingLevel.OFF);
- DecanterTraceEventHandler handler = new DecanterTraceEventHandler();
- handler.setEventAdmin(eventAdmin);
- tracer.addTraceHandler(handler);
- camelContext.setTracing(true);
- camelContext.setDefaultTracer(tracer);
- camelContext.start();
-
- ProducerTemplate template = camelContext.createProducerTemplate();
- template.sendBodyAndHeader("direct:start", "TEST", "header", "test");
-
- for (Event event : eventAdmin.getPostEvents()) {
- String jsonString = marshaller.marshal(event);
- JsonReader jsonReader = Json.createReader(new StringReader(jsonString));
- JsonObject rootObject = jsonReader.readObject();
- Assert.assertEquals("InOnly", rootObject.getString("exchangePattern"));
- Assert.assertEquals("camelTracer", rootObject.getString("type"));
- Assert.assertEquals("log://foo", rootObject.getString("toNode"));
- Assert.assertEquals("testRoute", rootObject.getString("routeId"));
- JsonObject headersObject = rootObject.getJsonObject("inHeaders");
- Assert.assertEquals("test", headersObject.getString("header"));
- Assert.assertEquals("direct://start", rootObject.getString("fromEndpointUri"));
- Assert.assertEquals("to1", rootObject.getString("nodeId"));
- Assert.assertEquals("TEST", rootObject.getString("inBody"));
- JsonObject propertiesObject = rootObject.getJsonObject("properties");
- Assert.assertEquals("log://foo", propertiesObject.getString("CamelToEndpoint"));
- Assert.assertEquals("String", rootObject.getString("inBodyType"));
- Assert.assertEquals("decanter/collect/camel/tracer", rootObject.getString("event_topics"));
- System.out.println(marshaller.marshal(event));
- }
- }
-
- private class DispatcherMock implements EventAdmin {
-
- private List<Event> postEvents = new ArrayList<>();
- private List<Event> sendEvents = new ArrayList<>();
-
- @Override
- public void postEvent(Event event) {
- postEvents.add(event);
- }
-
- @Override
- public void sendEvent(Event event) {
- System.out.println("SEND EVENT");
- sendEvents.add(event);
- }
-
- public List<Event> getPostEvents() {
- return postEvents;
- }
-
- public List<Event> getSendEvents() {
- return sendEvents;
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel-tracer/src/test/resources/sample.xml
----------------------------------------------------------------------
diff --git a/collector/camel-tracer/src/test/resources/sample.xml b/collector/camel-tracer/src/test/resources/sample.xml
deleted file mode 100644
index 935e614..0000000
--- a/collector/camel-tracer/src/test/resources/sample.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-
- <reference id="eventAdmin" interface="org.osgi.service.event.EventAdmin"/>
-
- <bean id="traceHandler" class="org.apache.karaf.decanter.collector.camel.DecanterTraceEventHandler">
- <property name="eventAdmin" ref="eventAdmin"/>
- </bean>
-
- <bean id="tracer" class="org.apache.camel.processor.interceptor.Tracer">
- <property name="traceHandler" ref="traceHandler"/>
- <property name="enabled" value="true"/>
- <property name="traceOutExchanges" value="true"/>
- <property name="logLevel" value="OFF"/>
- </bean>
-
- <camelContext trace="true" xmlns="http://camel.apache.org/schema/blueprint">
- <route id="test">
- <from uri="timer:fire?period=10000"/>
- <setBody><constant>Hello World</constant></setBody>
- <to uri="log:test"/>
- </route>
- </camelContext>
-
-</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/LICENSE
----------------------------------------------------------------------
diff --git a/collector/camel/LICENSE b/collector/camel/LICENSE
new file mode 100644
index 0000000..b36a53d
--- /dev/null
+++ b/collector/camel/LICENSE
@@ -0,0 +1,475 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+For asm:
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+For equinox:
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT").
+ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor.
+A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate
+modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale
+of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code
+and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
+royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer
+the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to
+the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall
+not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
+assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity
+based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses
+granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights
+needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program,
+it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any,
+to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
+warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
+incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
+other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain
+it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably
+allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering,
+such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor
+("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims,
+lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused
+by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a
+commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any
+actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly
+notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and
+cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
+then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
+Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
+those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
+the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for
+determining the appropriateness of using and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption
+of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity
+or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto,
+such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes
+such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the
+Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right
+to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse
+Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new
+version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may
+always be distributed subject to the version of the Agreement under which it was received. In addition, after a new
+version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions)
+under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
+of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the
+cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+For Java Service Wrapper:
+Copyright (c) 1999, 2006 Tanuki Software, Inc.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of the Java Service Wrapper and associated
+documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license,
+and/or sell copies of the Software, and to permit persons to
+whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+Portions of the Software have been derived from source code
+developed by Silver Egg Technology under the following license:
+
+BEGIN Silver Egg Techology License -----------------------------------
+
+ Copyright (c) 2001 Silver Egg Technology
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sub-license, and/or
+ sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+END Silver Egg Techology License -------------------------------------
+
+For slf4j
+Copyright (c) 2004-2011 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/NOTICE
----------------------------------------------------------------------
diff --git a/collector/camel/NOTICE b/collector/camel/NOTICE
new file mode 100644
index 0000000..aeef0e0
--- /dev/null
+++ b/collector/camel/NOTICE
@@ -0,0 +1,36 @@
+Apache Karaf Decanter
+Copyright 2015 The Apache Software Foundation
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Elastic (https://www.elastic.co/).
+Licensed under the Apache License 2.0.
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2010).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This product uses software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
+This product uses software developed at
+JUnit (http://www.junit.org/).
+Licensed under the Eclipse Public License 1.0.
+
+III. License Summary
+- Apache License 2.0
+- MIT License
+- Eclipse Public License 1.0
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/pom.xml
----------------------------------------------------------------------
diff --git a/collector/camel/pom.xml b/collector/camel/pom.xml
new file mode 100644
index 0000000..c753bf0
--- /dev/null
+++ b/collector/camel/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf.decanter</groupId>
+ <artifactId>collector</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.decanter.collector</groupId>
+ <artifactId>org.apache.karaf.decanter.collector.camel</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Karaf :: Decanter :: Collector :: Camel</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+
+ <!-- test -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.22</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.decanter.marshaller</groupId>
+ <artifactId>org.apache.karaf.decanter.marshaller.json</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.karaf.decanter.collector.camel
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a3d3ea29/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterCamelEventExtender.java
----------------------------------------------------------------------
diff --git a/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterCamelEventExtender.java b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterCamelEventExtender.java
new file mode 100644
index 0000000..71bef7e
--- /dev/null
+++ b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterCamelEventExtender.java
@@ -0,0 +1,30 @@
+/*
+ * 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.karaf.decanter.collector.camel;
+
+import org.apache.camel.Exchange;
+
+import java.util.Map;
+
+/**
+ * You can implement this interface to populate the Decanter event with extra properties, based on Camel Exchange.
+ */
+public interface DecanterCamelEventExtender {
+
+ void extend(Map<String, Object> decanterData, Exchange camelExchange);
+
+}