Repository: camel Updated Branches: refs/heads/master bda29676f -> fe0db8a46
http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-undertow/src/main/docs/undertow-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc b/components/camel-undertow/src/main/docs/undertow-component.adoc index 84df6e7..6c3ede5 100644 --- a/components/camel-undertow/src/main/docs/undertow-component.adoc +++ b/components/camel-undertow/src/main/docs/undertow-component.adoc @@ -62,7 +62,7 @@ The Undertow endpoint is configured using URI syntax: undertow:httpURI - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (1 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-velocity/src/main/docs/velocity-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-velocity/src/main/docs/velocity-component.adoc b/components/camel-velocity/src/main/docs/velocity-component.adoc index bb68d8c..d4fb768 100644 --- a/components/camel-velocity/src/main/docs/velocity-component.adoc +++ b/components/camel-velocity/src/main/docs/velocity-component.adoc @@ -59,7 +59,7 @@ The Velocity endpoint is configured using URI syntax: velocity:resourceUri - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (1 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-vertx/src/main/docs/vertx-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-vertx/src/main/docs/vertx-component.adoc b/components/camel-vertx/src/main/docs/vertx-component.adoc index 8b36f3c..3dae966 100644 --- a/components/camel-vertx/src/main/docs/vertx-component.adoc +++ b/components/camel-vertx/src/main/docs/vertx-component.adoc @@ -61,7 +61,7 @@ The Vert.x endpoint is configured using URI syntax: vertx:address - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (1 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-weather/src/main/docs/weather-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-weather/src/main/docs/weather-component.adoc b/components/camel-weather/src/main/docs/weather-component.adoc index 1dbddc1..d85483d 100644 --- a/components/camel-weather/src/main/docs/weather-component.adoc +++ b/components/camel-weather/src/main/docs/weather-component.adoc @@ -51,7 +51,7 @@ The Weather endpoint is configured using URI syntax: weather:name - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (1 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-websocket/src/main/docs/websocket-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/main/docs/websocket-component.adoc b/components/camel-websocket/src/main/docs/websocket-component.adoc index 1d7bde9..f45f32a 100644 --- a/components/camel-websocket/src/main/docs/websocket-component.adoc +++ b/components/camel-websocket/src/main/docs/websocket-component.adoc @@ -69,7 +69,7 @@ The Jetty Websocket endpoint is configured using URI syntax: websocket:host:port/resourceUri - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (3 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc b/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc index 8411452..538ebed 100644 --- a/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc +++ b/components/camel-xmlrpc/src/main/docs/xmlrpc-component.adoc @@ -105,7 +105,7 @@ The XML RPC endpoint is configured using URI syntax: xmlrpc:address - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (1 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc index 4524bba..2ad96be 100644 --- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc +++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-component.adoc @@ -251,7 +251,7 @@ The XML Security endpoint is configured using URI syntax: xmlsecurity:command:name - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (2 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-xmpp/src/main/docs/xmpp-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-xmpp/src/main/docs/xmpp-component.adoc b/components/camel-xmpp/src/main/docs/xmpp-component.adoc index 12c94ac..a0a11c5 100644 --- a/components/camel-xmpp/src/main/docs/xmpp-component.adoc +++ b/components/camel-xmpp/src/main/docs/xmpp-component.adoc @@ -47,7 +47,7 @@ The XMPP endpoint is configured using URI syntax: xmpp:host:port/participant - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (3 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-yammer/src/main/docs/yammer-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-yammer/src/main/docs/yammer-component.adoc b/components/camel-yammer/src/main/docs/yammer-component.adoc index 0ad7c8a..4cc543b 100644 --- a/components/camel-yammer/src/main/docs/yammer-component.adoc +++ b/components/camel-yammer/src/main/docs/yammer-component.adoc @@ -70,7 +70,7 @@ The Yammer endpoint is configured using URI syntax: yammer:function - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (1 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc index f40e22d..e5cb694 100644 --- a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc +++ b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc @@ -58,7 +58,7 @@ The ZooKeeper endpoint is configured using URI syntax: zookeeper:serverUrls/path - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (2 parameters): http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java index c0a5097..f2e9bd5 100644 --- a/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/component/mail/springboot/MailComponentConfiguration.java @@ -165,18 +165,18 @@ public class MailComponentConfiguration { */ private Boolean unseen; /** - * Sets the <tt>To</tt> email address. Separate multiple email addresses - * with comma. + * Sets the To email address. Separate multiple email addresses with + * comma. */ private String to; /** - * Sets the <tt>CC</tt> email address. Separate multiple email addresses - * with comma. + * Sets the CC email address. Separate multiple email addresses with + * comma. */ private String cc; /** - * Sets the <tt>BCC</tt> email address. Separate multiple email - * addresses with comma. + * Sets the BCC email address. Separate multiple email addresses with + * comma. */ private String bcc; /** http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java index 3a4fad1..837f5bf 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java @@ -141,10 +141,15 @@ public class UpdateReadmeMojo extends AbstractMojo { } } + String docTitle = model.getTitle() + " Component"; + boolean deprecated = "true".equals(model.getDeprecated()); + if (deprecated) { + docTitle += " (deprecated)"; + } + boolean exists = file.exists(); boolean updated; - - updated = updateTitles(file, model.getTitle() + " Component"); + updated = updateTitles(file, docTitle); updated |= updateAvailableFrom(file, model.getFirstVersion()); // resolvePropertyPlaceholders is an option which only make sense to use if the component has other options @@ -196,10 +201,15 @@ public class UpdateReadmeMojo extends AbstractMojo { String title = asDataFormatTitle(model.getName(), model.getTitle()); model.setTitle(title); + String docTitle = model.getTitle() + " DataFormat"; + boolean deprecated = "true".equals(model.getDeprecated()); + if (deprecated) { + docTitle += " (deprecated)"; + } + boolean exists = file.exists(); boolean updated; - - updated = updateTitles(file, model.getTitle() + " DataFormat"); + updated = updateTitles(file, docTitle); updated |= updateAvailableFrom(file, model.getFirstVersion()); String options = templateDataFormatOptions(model); @@ -246,10 +256,15 @@ public class UpdateReadmeMojo extends AbstractMojo { LanguageModel model = generateLanguageModel(languageName, json); + String docTitle = model.getTitle() + " Language"; + boolean deprecated = "true".equals(model.getDeprecated()); + if (deprecated) { + docTitle += " (deprecated)"; + } + boolean exists = file.exists(); boolean updated; - - updated = updateTitles(file, model.getTitle() + " Language"); + updated = updateTitles(file, docTitle); updated |= updateAvailableFrom(file, model.getFirstVersion()); String options = templateLanguageOptions(model); @@ -305,10 +320,15 @@ public class UpdateReadmeMojo extends AbstractMojo { File file = new File(eipDocDir, eipName + "-eip.adoc"); + String docTitle = model.getTitle() + " EIP"; + boolean deprecated = model.isDeprecated(); + if (deprecated) { + docTitle += " (deprecated)"; + } + boolean exists = file.exists(); boolean updated; - - updated = updateTitles(file, model.getTitle() + " EIP"); + updated = updateTitles(file, docTitle); String options = templateEipOptions(model); updated |= updateEipOptions(file, options); http://git-wip-us.apache.org/repos/asf/camel/blob/27027149/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel index e0c95df..12c3fb3 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/endpoint-options.mvel @@ -2,7 +2,7 @@ The @{title} endpoint is configured using URI syntax: @{syntax} - with the following path and query parameters: +with the following path and query parameters: #### Path Parameters (@{endpointPathOptions.size()} parameters):