You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/02/12 15:19:28 UTC
[2/6] camel git commit: CAMEL-7999: Include component documentation
CAMEL-7999: Include component documentation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8e8f17d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8e8f17d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8e8f17d
Branch: refs/heads/master
Commit: a8e8f17d941c5aca43f2e888ebc5e4708422181b
Parents: f70b102
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Feb 12 15:03:51 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Feb 12 15:19:50 2015 +0100
----------------------------------------------------------------------
.../paxlogging/PaxLoggingComponent.java | 6 ++---
.../paxlogging/PaxLoggingConsumer.java | 6 ++---
.../paxlogging/PaxLoggingEndpoint.java | 23 ++++++++++++++++----
3 files changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a8e8f17d/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java
index 3e32613..5b2a22a 100644
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java
+++ b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingComponent.java
@@ -20,21 +20,21 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
import org.osgi.framework.BundleContext;
/**
* The pax-logging component allows receiving log events from OPS4j PaxLogging
* and send them to camel routes.
*/
-public class PaxLoggingComponent extends DefaultComponent {
+public class PaxLoggingComponent extends UriEndpointComponent {
public static final String NAME = "paxlogging";
private final BundleContext bundleContext;
public PaxLoggingComponent(CamelContext context, BundleContext bundleContext) {
- super(context);
+ super(context, PaxLoggingEndpoint.class);
this.bundleContext = bundleContext;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a8e8f17d/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
index 51eb2dc..25702a7 100644
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
+++ b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingConsumer.java
@@ -63,7 +63,7 @@ public class PaxLoggingConsumer extends DefaultConsumer implements PaxAppender {
}
protected void sendExchange(PaxLoggingEvent paxLoggingEvent) {
- MDC.put(PaxLoggingConsumer.class.getName(), endpoint.getName());
+ MDC.put(PaxLoggingConsumer.class.getName(), endpoint.getAppender());
if (paxLoggingEvent.getProperties().containsKey(PaxLoggingConsumer.class.getName())) {
return;
}
@@ -73,7 +73,7 @@ public class PaxLoggingConsumer extends DefaultConsumer implements PaxAppender {
exchange.getIn().setBody(paxLoggingEvent);
if (LOG.isTraceEnabled()) {
- LOG.trace("PaxLogging {} is firing", endpoint.getName());
+ LOG.trace("PaxLogging {} is firing", endpoint.getAppender());
}
try {
getProcessor().process(exchange);
@@ -90,7 +90,7 @@ public class PaxLoggingConsumer extends DefaultConsumer implements PaxAppender {
protected void doStart() throws Exception {
super.doStart();
Dictionary<String, String> props = new Hashtable<String, String>();
- props.put("org.ops4j.pax.logging.appender.name", endpoint.getName());
+ props.put("org.ops4j.pax.logging.appender.name", endpoint.getAppender());
registration = endpoint.getComponent().getBundleContext().registerService(PaxAppender.class.getName(), this, props);
executor = endpoint.getCamelContext().getExecutorServiceManager().newSingleThreadExecutor(this, "PaxLoggingEventTask");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a8e8f17d/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
index 7f9f8a7..e0e60e3 100644
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
+++ b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/PaxLoggingEndpoint.java
@@ -21,21 +21,36 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriPath;
/**
* Paxlogging endpoint.
*/
+@UriEndpoint(scheme = "paxlogging", consumerOnly = true, consumerClass = PaxLoggingConsumer.class, label = "monitoring")
public class PaxLoggingEndpoint extends DefaultEndpoint {
- private final String name;
+ @UriPath
+ private final String appender;
- public PaxLoggingEndpoint(String uri, PaxLoggingComponent component, String name) {
+ public PaxLoggingEndpoint(String uri, PaxLoggingComponent component, String appender) {
super(uri, component);
- this.name = name;
+ this.appender = appender;
}
+ /**
+ * Appender is the name of the pax appender that need to be configured in the PaxLogging service configuration.
+ */
+ public String getAppender() {
+ return appender;
+ }
+
+ /**
+ * @deprecated use {@link #getAppender()}
+ */
+ @Deprecated
public String getName() {
- return name;
+ return getAppender();
}
public PaxLoggingComponent getComponent() {