You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/08 11:16:32 UTC
[camel] 07/21: CAMEL-13792 - Rename components to default names,
Camel-netty4-http to camel-netty-http - Fixed more refs, docs and regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6aa6939eb3c48a5291e37bc743257d9a0f19895c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 8 11:23:28 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed more refs, docs and regen
---
components/camel-rest/src/main/docs/rest-component.adoc | 4 ++--
components/camel-telegram/src/main/docs/telegram-component.adoc | 4 ++--
.../src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java | 2 +-
.../src/main/java/org/apache/camel/spi/RestConfiguration.java | 2 +-
core/camel-core/src/main/docs/eips/toD-eip.adoc | 2 +-
.../java/org/apache/camel/model/rest/RestConfigurationDefinition.java | 4 ++--
.../main/java/org/apache/camel/main/RestConfigurationProperties.java | 2 +-
.../main/resources/META-INF/camel-main-configuration-metadata.json | 2 +-
docs/components/modules/ROOT/pages/rest-component.adoc | 4 ++--
docs/components/modules/ROOT/pages/telegram-component.adoc | 4 ++--
docs/user-manual/modules/ROOT/pages/toD-eip.adoc | 2 +-
.../model/rest/springboot/RestConfigurationDefinitionProperties.java | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/components/camel-rest/src/main/docs/rest-component.adoc b/components/camel-rest/src/main/docs/rest-component.adoc
index 6c31c4c..f103ca3 100644
--- a/components/camel-rest/src/main/docs/rest-component.adoc
+++ b/components/camel-rest/src/main/docs/rest-component.adoc
@@ -123,7 +123,7 @@ The component supports 8 options, which are listed below.
The following components support rest consumer (Rest DSL):
* camel-coap
-* camel-netty4-http
+* camel-netty-http
* camel-jetty
* camel-restlet
* camel-servlet
@@ -133,7 +133,7 @@ The following components support rest consumer (Rest DSL):
The following components support rest producer:
* camel-http
-* camel-netty4-http
+* camel-netty-http
* camel-jetty
* camel-restlet
* camel-undertow
diff --git a/components/camel-telegram/src/main/docs/telegram-component.adoc b/components/camel-telegram/src/main/docs/telegram-component.adoc
index 506d31f..ca5c81c 100644
--- a/components/camel-telegram/src/main/docs/telegram-component.adoc
+++ b/components/camel-telegram/src/main/docs/telegram-component.adoc
@@ -413,13 +413,13 @@ from("telegram:bots/123456789:insertYourAuthorizationTokenHere")
The Telegram component supports usage in the *webhook mode* using the *camel-webhook* component.
In order to enable webhook mode, users need first to add a REST implementation to their application.
-Maven users, for example, can add *netty4-http* to their `pom.xml` file:
+Maven users, for example, can add *netty-http* to their `pom.xml` file:
[source,xml]
------------------------------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-http</artifactId>
+ <artifactId>camel-netty-http</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java
index e3af817..216f0c6 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RestApiConsumerFactory.java
@@ -27,7 +27,7 @@ import org.apache.camel.Processor;
* for handling incoming HTTP GET requests from clients that request to access the REST API documentation.
* <p/>
* For example most of the Camel components that supports REST-DSL does that,
- * such as <tt>camel-jetty</tt>, <tt>camel-netty4-http</tt>.
+ * such as <tt>camel-jetty</tt>, <tt>camel-netty-http</tt>.
*/
public interface RestApiConsumerFactory {
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java b/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
index 3c81d3e..5331c5c 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
@@ -241,7 +241,7 @@ public class RestConfiguration {
* Sets a leading context-path the REST services will be using.
* <p/>
* This can be used when using components such as <tt>camel-servlet</tt> where the deployed web application
- * is deployed using a context-path. Or for components such as <tt>camel-jetty</tt> or <tt>camel-netty4-http</tt>
+ * is deployed using a context-path. Or for components such as <tt>camel-jetty</tt> or <tt>camel-netty-http</tt>
* that includes a HTTP server.
*
* @param contextPath the context path
diff --git a/core/camel-core/src/main/docs/eips/toD-eip.adoc b/core/camel-core/src/main/docs/eips/toD-eip.adoc
index 09e3253..6d4c619 100644
--- a/core/camel-core/src/main/docs/eips/toD-eip.adoc
+++ b/core/camel-core/src/main/docs/eips/toD-eip.adoc
@@ -166,7 +166,7 @@ This is with the following components, which have been optimised for `toD`:
- camel-http
- camel-jetty
-- camel-netty4-http
+- camel-netty-http
- camel-undertow
For the optimisation to work, then:
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
index 3b14a16..f5c1ba4 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
@@ -239,7 +239,7 @@ public class RestConfigurationDefinition {
* Sets a leading context-path the REST services will be using.
* <p/>
* This can be used when using components such as <tt>camel-servlet</tt> where the deployed web application
- * is deployed using a context-path. Or for components such as <tt>camel-jetty</tt> or <tt>camel-netty4-http</tt>
+ * is deployed using a context-path. Or for components such as <tt>camel-jetty</tt> or <tt>camel-netty-http</tt>
* that includes a HTTP server.
*/
public void setContextPath(String contextPath) {
@@ -586,7 +586,7 @@ public class RestConfigurationDefinition {
* Sets a leading context-path the REST services will be using.
* <p/>
* This can be used when using components such as <tt>camel-servlet</tt> where the deployed web application
- * is deployed using a context-path. Or for components such as <tt>camel-jetty</tt> or <tt>camel-netty4-http</tt>
+ * is deployed using a context-path. Or for components such as <tt>camel-jetty</tt> or <tt>camel-netty-http</tt>
* that includes a HTTP server.
*/
public RestConfigurationDefinition apiContextPath(String contextPath) {
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
index 9faef3c..9d76534 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
@@ -142,7 +142,7 @@ public class RestConfigurationProperties extends RestConfiguration {
* Sets a leading context-path the REST services will be using.
* <p/>
* This can be used when using components such as <tt>camel-servlet</tt> where the deployed web application
- * is deployed using a context-path. Or for components such as <tt>camel-jetty</tt> or <tt>camel-netty4-http</tt>
+ * is deployed using a context-path. Or for components such as <tt>camel-jetty</tt> or <tt>camel-netty-http</tt>
* that includes a HTTP server.
*/
public RestConfigurationProperties withContextPath(String contextPath) {
diff --git a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
index dbc5104..6170560 100644
--- a/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
+++ b/core/camel-main/src/main/resources/META-INF/camel-main-configuration-metadata.json
@@ -624,7 +624,7 @@
"name":"camel.rest.context-path",
"type":"java.lang.String",
"sourceType":"org.apache.camel.spi.RestConfiguration",
- "description":"Sets a leading context-path the REST services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path. Or for components such as camel-jetty or camel-netty4-http that includes a HTTP server."
+ "description":"Sets a leading context-path the REST services will be using. This can be used when using components such as camel-servlet where the deployed web application is deployed using a context-path. Or for components such as camel-jetty or camel-netty-http that includes a HTTP server."
},
{
"name":"camel.rest.cors-headers",
diff --git a/docs/components/modules/ROOT/pages/rest-component.adoc b/docs/components/modules/ROOT/pages/rest-component.adoc
index 6c31c4c..f103ca3 100644
--- a/docs/components/modules/ROOT/pages/rest-component.adoc
+++ b/docs/components/modules/ROOT/pages/rest-component.adoc
@@ -123,7 +123,7 @@ The component supports 8 options, which are listed below.
The following components support rest consumer (Rest DSL):
* camel-coap
-* camel-netty4-http
+* camel-netty-http
* camel-jetty
* camel-restlet
* camel-servlet
@@ -133,7 +133,7 @@ The following components support rest consumer (Rest DSL):
The following components support rest producer:
* camel-http
-* camel-netty4-http
+* camel-netty-http
* camel-jetty
* camel-restlet
* camel-undertow
diff --git a/docs/components/modules/ROOT/pages/telegram-component.adoc b/docs/components/modules/ROOT/pages/telegram-component.adoc
index 506d31f..ca5c81c 100644
--- a/docs/components/modules/ROOT/pages/telegram-component.adoc
+++ b/docs/components/modules/ROOT/pages/telegram-component.adoc
@@ -413,13 +413,13 @@ from("telegram:bots/123456789:insertYourAuthorizationTokenHere")
The Telegram component supports usage in the *webhook mode* using the *camel-webhook* component.
In order to enable webhook mode, users need first to add a REST implementation to their application.
-Maven users, for example, can add *netty4-http* to their `pom.xml` file:
+Maven users, for example, can add *netty-http* to their `pom.xml` file:
[source,xml]
------------------------------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-netty4-http</artifactId>
+ <artifactId>camel-netty-http</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
diff --git a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
index 09e3253..6d4c619 100644
--- a/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/toD-eip.adoc
@@ -166,7 +166,7 @@ This is with the following components, which have been optimised for `toD`:
- camel-http
- camel-jetty
-- camel-netty4-http
+- camel-netty-http
- camel-undertow
For the optimisation to work, then:
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java
index d66fcd5..bcdb1f7 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/rest/springboot/RestConfigurationDefinitionProperties.java
@@ -92,7 +92,7 @@ public class RestConfigurationDefinitionProperties {
* Sets a leading context-path the REST services will be using. This can be
* used when using components such as camel-servlet where the deployed web
* application is deployed using a context-path. Or for components such as
- * camel-jetty or camel-netty4-http that includes a HTTP server.
+ * camel-jetty or camel-netty-http that includes a HTTP server.
*/
private String contextPath;
/**