camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] camel git commit: CAMEL-10775: Add information to components which version they were added to Camel
Date Thu, 02 Feb 2017 17:44:03 GMT
Repository: camel
Updated Branches:
  refs/heads/master c3991afc4 -> ef4e7ed52


CAMEL-10775: Add information to components which version they were added to Camel


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ab55da5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ab55da5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ab55da5

Branch: refs/heads/master
Commit: 1ab55da5ac782486380a25f4e5513eb6e22562a2
Parents: c3991af
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Feb 2 18:37:00 2017 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Feb 2 18:37:00 2017 +0100

----------------------------------------------------------------------
 .../component/etcd/AbstractEtcdEndpoint.java    | 10 ----------
 .../etcd/AbstractEtcdPollingEndpoint.java       |  6 +++---
 .../component/influxdb/InfluxDbEndpoint.java    |  2 +-
 .../camel/component/mllp/MllpEndpoint.java      |  2 +-
 .../apache/camel/component/pdf/PdfEndpoint.java |  2 +-
 .../streams/ReactiveStreamsEndpoint.java        |  2 +-
 .../camel/component/splunk/SplunkEndpoint.java  |  2 +-
 .../camel/component/tika/TikaEndpoint.java      |  2 +-
 .../maven/packaging/PackageDataFormatMojo.java  | 21 ++++++++++++++++++++
 9 files changed, 30 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdEndpoint.java
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdEndpoint.java
index 6b21161..91a0c8b 100644
--- a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdEndpoint.java
+++ b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdEndpoint.java
@@ -18,24 +18,14 @@ package org.apache.camel.component.etcd;
 
 import mousio.etcd4j.EtcdClient;
 import org.apache.camel.impl.DefaultEndpoint;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
 
 /**
  * The camel etcd component allows you to work with <a href="https://coreos.com/etcd">Etcd</a>,
a distributed reliable key-value store.
  */
-@UriEndpoint(firstVersion = "2.18.0", scheme = "etcd", title = "etcd", syntax = "etcd:namespace/path",
consumerClass = AbstractEtcdConsumer.class, label = "etcd")
 public abstract class AbstractEtcdEndpoint extends DefaultEndpoint implements EtcdEndpoint
{
 
-    @UriPath(description = "The API namespace to use", enums = "keys,stats,watch")
-    @Metadata(required = "true")
     private final EtcdNamespace namespace;
-    @UriPath(description = "The path the endpoint refers to")
-    @Metadata(required = "false")
     private final String path;
-    @UriParam
     private final EtcdConfiguration configuration;
 
     protected AbstractEtcdEndpoint(String uri, EtcdComponent component, EtcdConfiguration
configuration, EtcdNamespace namespace, String path) {

http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdPollingEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdPollingEndpoint.java
b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdPollingEndpoint.java
index af2572e..e5b0ed0 100644
--- a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdPollingEndpoint.java
+++ b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/AbstractEtcdPollingEndpoint.java
@@ -24,15 +24,15 @@ import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
 
 /**
- * The camel etcd component allows you to work with <a href="https://coreos.com/etcd">Etcd</a>,
a distributed, A distributed, reliable key-value store.
+ * The camel etcd component allows you to work with <a href="https://coreos.com/etcd">Etcd</a>,
a distributed reliable key-value store.
  */
-@UriEndpoint(scheme = "etcd", title = "etcd", syntax = "etcd:namespace/path", consumerClass
= AbstractEtcdConsumer.class, label = "etcd")
+@UriEndpoint(firstVersion = "2.18.0", scheme = "etcd", title = "etcd", syntax = "etcd:namespace/path",
consumerClass = AbstractEtcdConsumer.class, label = "clustering,database")
 public abstract class AbstractEtcdPollingEndpoint extends DefaultPollingEndpoint implements
EtcdEndpoint {
 
     @UriPath(description = "The API namespace to use", enums = "keys,stats,watch")
     @Metadata(required = "true")
     private final EtcdNamespace namespace;
-    @UriPath(description = "The path the enpoint refers to")
+    @UriPath(description = "The path the endpoint refers to")
     @Metadata(required = "false")
     private final String path;
     @UriParam

http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
index eaf6bb2..2ce2747 100644
--- a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
+++ b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/InfluxDbEndpoint.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 /**
  * The influxdb component allows you to interact with <a href="https://influxdata.com/time-series-platform/influxdb/">InfluxDB</a>,
a time series database.
  */
-@UriEndpoint(firstVersion = "2.18.0", scheme = "influxdb", title = "InfluxDB", syntax = "influxdb:connectionBean",
label = "database,ticks", producerOnly = true)
+@UriEndpoint(firstVersion = "2.18.0", scheme = "influxdb", title = "InfluxDB", syntax = "influxdb:connectionBean",
label = "database", producerOnly = true)
 public class InfluxDbEndpoint extends DefaultEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(InfluxDbEndpoint.class);

http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
index 08837d0..fb57f7b 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpEndpoint.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  * property to false.
  * <p/>
  */
-@UriEndpoint(firstVersion = "2.17.0", scheme = "mllp", title = "MLLP", syntax = "mllp:hostname:port",
consumerClass = MllpTcpServerConsumer.class, label = "mllp")
+@UriEndpoint(firstVersion = "2.17.0", scheme = "mllp", title = "MLLP", syntax = "mllp:hostname:port",
consumerClass = MllpTcpServerConsumer.class, label = "hl7")
 public class MllpEndpoint extends DefaultEndpoint {
     public static final char START_OF_BLOCK = 0x0b;      // VT (vertical tab)        - decimal
11, octal 013
     public static final char END_OF_BLOCK = 0x1c;        // FS (file separator)      - decimal
28, octal 034

http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java
b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java
index 295f2b3..5400f7a 100644
--- a/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java
+++ b/components/camel-pdf/src/main/java/org/apache/camel/component/pdf/PdfEndpoint.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.UriParam;
 /**
  * The pdf components provides the ability to create, modify or extract content from PDF
documents.
  */
-@UriEndpoint(firstVersion = "2.16.0", scheme = "pdf", title = "PDF", syntax = "pdf:operation",
producerOnly = true, label = "pdf,printing")
+@UriEndpoint(firstVersion = "2.16.0", scheme = "pdf", title = "PDF", syntax = "pdf:operation",
producerOnly = true, label = "document,transformation,printing")
 public class PdfEndpoint extends DefaultEndpoint {
 
     @UriParam

http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java
b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java
index 42de155..e2948fd 100644
--- a/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java
+++ b/components/camel-reactive-streams/src/main/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpoint.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.UriPath;
  * The Camel reactive-streams endpoint.
  */
 @UriEndpoint(firstVersion = "2.19.0", scheme = "reactive-streams", title = "Reactive Streams",
syntax = "reactive-streams:stream",
-        consumerClass = ReactiveStreamsConsumer.class, label = "streams")
+        consumerClass = ReactiveStreamsConsumer.class, label = "reactive,streams")
 public class ReactiveStreamsEndpoint extends DefaultEndpoint {
 
     @UriPath

http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
index e4f503c..823f863 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/SplunkEndpoint.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 /**
  * The splunk component allows to publish or search for events in Splunk.
  */
-@UriEndpoint(firstVersion = "2.13.0", scheme = "splunk", title = "Splunk", syntax = "splunk:name",
consumerClass = SplunkConsumer.class, label = "monitoring")
+@UriEndpoint(firstVersion = "2.13.0", scheme = "splunk", title = "Splunk", syntax = "splunk:name",
consumerClass = SplunkConsumer.class, label = "log,monitoring")
 public class SplunkEndpoint extends ScheduledPollEndpoint {
     private static final Logger LOG = LoggerFactory.getLogger(SplunkEndpoint.class);
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaEndpoint.java
b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaEndpoint.java
index ab85095..97e2917 100644
--- a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaEndpoint.java
+++ b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaEndpoint.java
@@ -24,7 +24,7 @@ import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 
-@UriEndpoint(firstVersion = "2.19.0", scheme = "tika", title = "Tika", syntax = "tika:operation",
producerOnly = true, label = "transformation")
+@UriEndpoint(firstVersion = "2.19.0", scheme = "tika", title = "Tika", syntax = "tika:operation",
producerOnly = true, label = "document,transformation")
 public class TikaEndpoint extends DefaultEndpoint {
 
     @UriParam

http://git-wip-us.apache.org/repos/asf/camel/blob/1ab55da5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 474de8a..ead42e5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -198,6 +198,13 @@ public class PackageDataFormatMojo extends AbstractMojo {
                                     }
                                 }
                             }
+
+                            // first version special for json
+                            String firstVersion = prepareJsonFirstVersion(name);
+                            if (firstVersion != null) {
+                                dataFormatModel.setFirstVersion(firstVersion);
+                            }
+
                             log.debug("Model " + dataFormatModel);
 
                             // build json schema for the data format
@@ -315,6 +322,20 @@ public class PackageDataFormatMojo extends AbstractMojo {
         return properties;
     }
 
+    private static String prepareJsonFirstVersion(String name) {
+        if ("json-gson".equals(name)) {
+            return "2.10.0";
+        } else if ("json-jackson".equals(name)) {
+            return "2.0.0";
+        } else if ("json-johnzon".equals(name)) {
+            return "2.18.0";
+        } else if ("json-xstream".equals(name)) {
+            return "2.0.0";
+        }
+
+        return null;
+    }
+
     private static String readClassFromCamelResource(File file, StringBuilder buffer, BuildContext
buildContext) throws MojoExecutionException {
         // skip directories as there may be a sub .resolver directory
         if (file.isDirectory()) {


Mime
View raw message