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/01 10:55:19 UTC
[camel] branch master updated: CAMEL-13792 - Rename components to
default names,
Camel-http4 to Camel-http - Removed reference to http4 in camel-opentracing
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
The following commit(s) were added to refs/heads/master by this push:
new 0bca779 CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-opentracing and regen
0bca779 is described below
commit 0bca7798e3f93a7a24f11aced8e47c6e8084e33c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 12:54:51 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-http4 to Camel-http - Removed reference to http4 in camel-opentracing and regen
---
.../camel-jetty/src/main/docs/jetty-component.adoc | 2 +-
.../opentracing/decorators/Http4SpanDecorator.java | 26 ----------------------
.../org.apache.camel.opentracing.SpanDecorator | 1 -
.../dsl/JettyHttpEndpointBuilder9Factory.java | 16 ++++++-------
4 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index c3d1349..1095244 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -126,7 +126,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *disableStreamCache* (common) | Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file, Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream, such as streaming it directly to a file or other persis [...]
+| *disableStreamCache* (common) | Determines whether or not the raw input stream from Servlet is cached or not (Camel will read the stream into a in memory/overflow to file, Stream caching) cache. By default Camel will cache the Servlet input stream to support reading it multiple times to ensure it Camel can retrieve all data from the stream. However you can set this option to true when you for example need to access the raw stream, such as streaming it directly to a file or other persis [...]
| *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. | | HeaderFilterStrategy
| *httpBinding* (common) | To use a custom HttpBinding to control the mapping between Camel message and HttpClient. | | HttpBinding
| *async* (consumer) | Configure the consumer to work in async mode | false | boolean
diff --git a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/Http4SpanDecorator.java b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/Http4SpanDecorator.java
deleted file mode 100644
index 53ce7c8..0000000
--- a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/decorators/Http4SpanDecorator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.opentracing.decorators;
-
-public class Http4SpanDecorator extends AbstractHttpSpanDecorator {
-
- @Override
- public String getComponent() {
- return "http4";
- }
-
-}
diff --git a/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator b/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator
index 7c11838..683ac05 100644
--- a/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator
+++ b/components/camel-opentracing/src/main/resources/META-INF/services/org.apache.camel.opentracing.SpanDecorator
@@ -27,7 +27,6 @@ org.apache.camel.opentracing.decorators.DirectvmSpanDecorator
org.apache.camel.opentracing.decorators.DisruptorSpanDecorator
org.apache.camel.opentracing.decorators.DisruptorvmSpanDecorator
org.apache.camel.opentracing.decorators.ElasticsearchSpanDecorator
-org.apache.camel.opentracing.decorators.Http4SpanDecorator
org.apache.camel.opentracing.decorators.HttpSpanDecorator
org.apache.camel.opentracing.decorators.IronmqSpanDecorator
org.apache.camel.opentracing.decorators.JdbcSpanDecorator
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
index 711247d..6195b7f 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilder9Factory.java
@@ -54,10 +54,10 @@ public interface JettyHttpEndpointBuilder9Factory {
* reading the stream multiple times. If you use Servlet to bridge/proxy
* an endpoint then consider enabling this option to improve
* performance, in case you do not need to read the message payload
- * multiple times. The http/http4 producer will by default cache the
- * response body stream. If setting this option to true, then the
- * producers will not cache the response body stream but use the
- * response stream as-is as the message body.
+ * multiple times. The http producer will by default cache the response
+ * body stream. If setting this option to true, then the producers will
+ * not cache the response body stream but use the response stream as-is
+ * as the message body.
*
* The option is a: <code>boolean</code> type.
*
@@ -81,10 +81,10 @@ public interface JettyHttpEndpointBuilder9Factory {
* reading the stream multiple times. If you use Servlet to bridge/proxy
* an endpoint then consider enabling this option to improve
* performance, in case you do not need to read the message payload
- * multiple times. The http/http4 producer will by default cache the
- * response body stream. If setting this option to true, then the
- * producers will not cache the response body stream but use the
- * response stream as-is as the message body.
+ * multiple times. The http producer will by default cache the response
+ * body stream. If setting this option to true, then the producers will
+ * not cache the response body stream but use the response stream as-is
+ * as the message body.
*
* The option will be converted to a <code>boolean</code> type.
*