This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new ae1158a fix image errors revealed by Antora 3.0.0-alpha.10; run
gulpfile
ae1158a is described below
commit ae1158ae460ad852e7b455cda06ae6d409dbb0ce
Author: David Jencks <[email protected]>
AuthorDate: Mon Oct 25 10:21:20 2021 -0700
fix image errors revealed by Antora 3.0.0-alpha.10; run gulpfile
---
.../src/main/docs/{ => modules/ROOT/images}/ControlBus.gif | Bin
.../main/docs/{ => modules/ROOT/images}/camel-direct-vm.png | Bin
.../camel-barcode/src/main/docs/barcode-dataformat.adoc | 2 +-
.../modules/ROOT/{assets => }/images/apache-ignite.png | Bin
.../modules/ROOT/{assets => }/images/camel-jmx.png | Bin
.../ROOT/{assets => }/images/camel_spark_cluster.png | Bin
.../modules/ROOT/{assets => }/images/camel_spark_driver.png | Bin
.../{assets => }/images/jconsole_trace_notifications.png | Bin
.../components/modules/ROOT/{assets => }/images/qr-code.png | Bin
docs/components/modules/ROOT/nav.adoc | 2 +-
docs/components/modules/ROOT/pages/cache-component.adoc | 2 +-
docs/components/modules/ROOT/pages/cxf-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/cxfrs-component.adoc | 4 +++-
.../components/modules/ROOT/pages/micrometer-component.adoc | 1 +
docs/components/modules/ROOT/pages/mina-component.adoc | 2 +-
.../modules/dataformats/pages/barcode-dataformat.adoc | 2 +-
docs/gulpfile.js | 4 ++--
17 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/camel-core/src/main/docs/ControlBus.gif
b/camel-core/src/main/docs/modules/ROOT/images/ControlBus.gif
similarity index 100%
rename from camel-core/src/main/docs/ControlBus.gif
rename to camel-core/src/main/docs/modules/ROOT/images/ControlBus.gif
diff --git a/camel-core/src/main/docs/camel-direct-vm.png
b/camel-core/src/main/docs/modules/ROOT/images/camel-direct-vm.png
similarity index 100%
rename from camel-core/src/main/docs/camel-direct-vm.png
rename to camel-core/src/main/docs/modules/ROOT/images/camel-direct-vm.png
diff --git a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
index 796ec1d..fa2a5b4 100644
--- a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
+++ b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
@@ -136,7 +136,7 @@ template.sendBody("direct://code", "This is a
testmessage!");
You should find inside the 'barcode_out' folder this image:
-image:qr-code.png[image]
+image:ROOT:qr-code.png[image]
=== Unmarshalling
diff --git a/docs/components/modules/ROOT/assets/images/apache-ignite.png
b/docs/components/modules/ROOT/images/apache-ignite.png
similarity index 100%
rename from docs/components/modules/ROOT/assets/images/apache-ignite.png
rename to docs/components/modules/ROOT/images/apache-ignite.png
diff --git a/docs/components/modules/ROOT/assets/images/camel-jmx.png
b/docs/components/modules/ROOT/images/camel-jmx.png
similarity index 100%
rename from docs/components/modules/ROOT/assets/images/camel-jmx.png
rename to docs/components/modules/ROOT/images/camel-jmx.png
diff --git a/docs/components/modules/ROOT/assets/images/camel_spark_cluster.png
b/docs/components/modules/ROOT/images/camel_spark_cluster.png
similarity index 100%
rename from docs/components/modules/ROOT/assets/images/camel_spark_cluster.png
rename to docs/components/modules/ROOT/images/camel_spark_cluster.png
diff --git a/docs/components/modules/ROOT/assets/images/camel_spark_driver.png
b/docs/components/modules/ROOT/images/camel_spark_driver.png
similarity index 100%
rename from docs/components/modules/ROOT/assets/images/camel_spark_driver.png
rename to docs/components/modules/ROOT/images/camel_spark_driver.png
diff --git
a/docs/components/modules/ROOT/assets/images/jconsole_trace_notifications.png
b/docs/components/modules/ROOT/images/jconsole_trace_notifications.png
similarity index 100%
rename from
docs/components/modules/ROOT/assets/images/jconsole_trace_notifications.png
rename to docs/components/modules/ROOT/images/jconsole_trace_notifications.png
diff --git a/docs/components/modules/ROOT/assets/images/qr-code.png
b/docs/components/modules/ROOT/images/qr-code.png
similarity index 100%
rename from docs/components/modules/ROOT/assets/images/qr-code.png
rename to docs/components/modules/ROOT/images/qr-code.png
diff --git a/docs/components/modules/ROOT/nav.adoc
b/docs/components/modules/ROOT/nav.adoc
index 13d470a..80d5ab4 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -79,8 +79,8 @@
** xref:dozer-component.adoc[Dozer]
** xref:drill-component.adoc[Drill]
** xref:dropbox-component.adoc[Dropbox]
-** xref:ehcache-component.adoc[Ehcache]
** xref:cache-component.adoc[EHCache]
+** xref:ehcache-component.adoc[Ehcache]
** xref:ejb-component.adoc[EJB]
** xref:elasticsearch-rest-component.adoc[Elastichsearch Rest]
** xref:elasticsearch-component.adoc[Elasticsearch]
diff --git a/docs/components/modules/ROOT/pages/cache-component.adoc
b/docs/components/modules/ROOT/pages/cache-component.adoc
index 7c9bcdd..218fa17 100644
--- a/docs/components/modules/ROOT/pages/cache-component.adoc
+++ b/docs/components/modules/ROOT/pages/cache-component.adoc
@@ -325,7 +325,7 @@ RouteBuilder builder = new RouteBuilder() {
public void configure() {
from("direct:start")
.setHeader(CacheConstants.CACHE_OPERATION,
constant(CacheConstants.CACHE_DELETE))
- .setHeader(CacheConstants.CACHE_KEY", constant("Ralph_Waldo_Emerson"))
+ .setHeader(CacheConstants.CACHE_KEY, constant("Ralph_Waldo_Emerson"))
.to("cache://TestCache1")
}
};
diff --git a/docs/components/modules/ROOT/pages/cxf-component.adoc
b/docs/components/modules/ROOT/pages/cxf-component.adoc
index 92185f0..f2ebe48 100644
--- a/docs/components/modules/ROOT/pages/cxf-component.adoc
+++ b/docs/components/modules/ROOT/pages/cxf-component.adoc
@@ -3,6 +3,8 @@
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source: components/camel-cxf/src/main/docs/cxf-component.adoc
:docTitle: CXF
+*Available as of Camel version 1.0*
+
:artifactId: camel-cxf
:description: The cxf component is used for SOAP WebServices using Apache CXF.
:since: 1.0
@@ -911,4 +913,4 @@ specific SOAPAction header. Therefore, when the target
service requires
a specific SOAPAction value, it is supplied in the Camel header using
the key SOAPAction (case-insensitive).
-
+
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/cxfrs-component.adoc
b/docs/components/modules/ROOT/pages/cxfrs-component.adoc
index 61d49c9..03b6c90 100644
--- a/docs/components/modules/ROOT/pages/cxfrs-component.adoc
+++ b/docs/components/modules/ROOT/pages/cxfrs-component.adoc
@@ -3,6 +3,8 @@
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source: components/camel-cxf/src/main/docs/cxfrs-component.adoc
:docTitle: CXF-RS
+*Available as of Camel version 2.0*
+
:artifactId: camel-cxf
:description: The cxfrs component is used for JAX-RS REST services using
Apache CXF.
:since: 2.0
@@ -513,4 +515,4 @@ Map<String, String> queryMap = new LinkedHashMap<>();
queryMap.put("q1", "new");
queryMap.put("q2", "world");
inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_QUERY_MAP, queryMap);
-----
+----
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/micrometer-component.adoc
b/docs/components/modules/ROOT/pages/micrometer-component.adoc
index 1387a8e..c040f30 100644
--- a/docs/components/modules/ROOT/pages/micrometer-component.adoc
+++ b/docs/components/modules/ROOT/pages/micrometer-component.adoc
@@ -232,6 +232,7 @@ tag `dynamic-key` with value `dynamic-value` in addition to
the tag `key` with v
All Metrics specific headers are removed from the message once the Micrometer
endpoint finishes processing of exchange. While processing exchange
Micrometer endpoint will catch all exceptions and write log entry using level
`warn`.
+
[#MicrometerComponent-counter]
== Counter
diff --git a/docs/components/modules/ROOT/pages/mina-component.adoc
b/docs/components/modules/ROOT/pages/mina-component.adoc
index 00b11db..041fa2f 100644
--- a/docs/components/modules/ROOT/pages/mina-component.adoc
+++ b/docs/components/modules/ROOT/pages/mina-component.adoc
@@ -16,7 +16,7 @@
*Deprecated*
WARNING: This component is deprecated as the Apache Mina 1.x project is EOL.
-Instead use xref:mina2-component.adoc[Mina 2] or
xref:netty-component.adoc[Netty] instead.
+Instead use xref:mina2-component.adoc[Mina 2] or
xref:mina2-component.adoc[Mina 2] instead.
The *mina:* component is a transport for working with
http://mina.apache.org/[Apache MINA]
diff --git a/docs/components/modules/dataformats/pages/barcode-dataformat.adoc
b/docs/components/modules/dataformats/pages/barcode-dataformat.adoc
index 76547c5..bc13f14 100644
--- a/docs/components/modules/dataformats/pages/barcode-dataformat.adoc
+++ b/docs/components/modules/dataformats/pages/barcode-dataformat.adoc
@@ -138,7 +138,7 @@ template.sendBody("direct://code", "This is a
testmessage!");
You should find inside the 'barcode_out' folder this image:
-image:qr-code.png[image]
+image:ROOT:qr-code.png[image]
=== Unmarshalling
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 26ec437..405acde 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -125,7 +125,7 @@ function createComponentLanguageSymlinks() {
}
function createComponentImageSymlinks() {
- return src('../components/{*,*/*}/src/main/docs/*.png')
+ return src(['../components/{*,*/*}/src/main/docs/*.{png,gif}'])
.pipe(map((file, done) => {
// this flattens the output to just .../pages/....adoc
// instead of .../pages/camel-.../src/main/docs/....adoc
@@ -141,7 +141,7 @@ function createComponentImageSymlinks() {
// }));
// uncomment above .pipe() and remove the .pipe() below
// when antora#188 is resolved
- .pipe(dest('components/modules/ROOT/assets/images/'));
+ .pipe(dest('components/modules/ROOT/images/'));
}
function titleFrom(file) {
