Repository: camel Updated Branches: refs/heads/master d5a43d1ec -> 9fc7ceff6
CAMEL-7999: More components include documentation Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fb7c4be1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fb7c4be1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fb7c4be1 Branch: refs/heads/master Commit: fb7c4be1d5ac8bafc24d9bad0bc33a81115b5840 Parents: 1d763cd Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 18 10:18:29 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 18 10:58:54 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/component/nagios/NagiosComponent.java | 11 +++-------- .../camel/component/nagios/NagiosConfiguration.java | 13 ++++++++++++- .../camel/component/nagios/NagiosEncryptionMethod.java | 2 +- .../apache/camel/component/nagios/NagiosEndpoint.java | 5 +++++ 4 files changed, 21 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fb7c4be1/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java index c8dd506..62258a0 100644 --- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java +++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosComponent.java @@ -19,27 +19,22 @@ package org.apache.camel.component.nagios; import java.net.URI; 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.apache.camel.util.ObjectHelper; /** * @version */ -public class NagiosComponent extends DefaultComponent { +public class NagiosComponent extends UriEndpointComponent { private NagiosConfiguration configuration; public NagiosComponent() { + super(NagiosEndpoint.class); configuration = new NagiosConfiguration(); } - public NagiosComponent(CamelContext context) { - super(context); - this.configuration = new NagiosConfiguration(); - } - @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { URI url = new URI(uri); http://git-wip-us.apache.org/repos/asf/camel/blob/fb7c4be1/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java index 62f232f..9d3460e 100644 --- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java +++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosConfiguration.java @@ -21,19 +21,30 @@ import java.net.URI; import com.googlecode.jsendnsca.core.Encryption; import com.googlecode.jsendnsca.core.NagiosSettings; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; import org.apache.camel.util.ObjectHelper; /** * @version */ +@UriParams public class NagiosConfiguration implements Cloneable { - private NagiosSettings nagiosSettings; + private transient NagiosSettings nagiosSettings; + + @UriPath private String host; + @UriPath private int port; + @UriParam(defaultValue = "5000") private int connectionTimeout = 5000; + @UriParam(defaultValue = "5000") private int timeout = 5000; + @UriParam private String password; + @UriParam private NagiosEncryptionMethod encryptionMethod; /** http://git-wip-us.apache.org/repos/asf/camel/blob/fb7c4be1/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java ---------------------------------------------------------------------- diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java index 4f595f6..80e1359 100644 --- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java +++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEncryptionMethod.java @@ -21,6 +21,6 @@ package org.apache.camel.component.nagios; */ public enum NagiosEncryptionMethod { - No, Xor, TripleDes; + No, Xor, TripleDes } http://git-wip-us.apache.org/repos/asf/camel/blob/fb7c4be1/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java index 70ed5e3..2983fc1 100644 --- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java +++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/NagiosEndpoint.java @@ -24,15 +24,20 @@ import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.apache.camel.util.ObjectHelper; /** * @version */ +@UriEndpoint(scheme = "nagios", label = "monitoring") public class NagiosEndpoint extends DefaultEndpoint { private INagiosPassiveCheckSender sender; + @UriParam private NagiosConfiguration configuration; + @UriParam(defaultValue = "true") private boolean sendSync = true; public NagiosEndpoint() {
