You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/08/20 14:44:43 UTC
[camel] branch master updated: CAMEL-13882: fixes broken images
This is an automated email from the ASF dual-hosted git repository.
zregvart 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 b5fd8d9 CAMEL-13882: fixes broken images
b5fd8d9 is described below
commit b5fd8d9e37bfe9199569ce20212f15c3deef3117
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Aug 20 16:35:37 2019 +0200
CAMEL-13882: fixes broken images
---
.../src/main/docs/barcode-dataformat.adoc | 2 +-
.../camel-controlbus/src/main/docs/control_bus.png | Bin 0 -> 2438 bytes
.../src/main/docs/controlbus-component.adoc | 2 +-
.../src/main/docs/direct-vm-component.adoc | 2 +-
components/camel-ignite/src/main/docs/ignite.adoc | 2 +-
.../camel-jmx/src/main/docs/jconsole_doubles.PNG | Bin 47415 -> 0 bytes
.../camel-spark/src/main/docs/spark-component.adoc | 4 +--
.../modules/ROOT/assets/images/apache-ignite.png | Bin 0 -> 919833 bytes
.../modules/ROOT/assets/images/camel-direct-vm.png | Bin 0 -> 129236 bytes
.../ROOT/assets/images/camel_spark_cluster.png | Bin 0 -> 172359 bytes
.../ROOT/assets/images/camel_spark_driver.png | Bin 0 -> 293927 bytes
.../modules/ROOT/assets/images/control_bus.png | Bin 0 -> 2438 bytes
.../controlbus-component.data/ControlBus.gif | Bin 3705 -> 0 bytes
.../modules/ROOT/assets/images/qr-code.png | Bin 0 -> 307 bytes
.../modules/ROOT/pages/barcode-dataformat.adoc | 2 +-
.../modules/ROOT/pages/controlbus-component.adoc | 2 +-
.../modules/ROOT/pages/direct-vm-component.adoc | 2 +-
docs/components/modules/ROOT/pages/ignite.adoc | 2 +-
.../modules/ROOT/pages/spark-component.adoc | 4 +--
docs/gulpfile.js | 30 ++++++++++++++++++++-
.../{images/camel-core.data => }/architecture.png | Bin
.../architecture_incl_violations.png | Bin
.../architecture.data => }/camel-components.png | Bin
.../camel-eclipse-m2e-import-completed.png | Bin
.../camel-eclipse-m2e-import.png | Bin
.../modules/ROOT/assets/images}/camel-jmx.png | Bin
.../async.data => }/camel_async_request_only.png | Bin
.../async.data => }/camel_async_request_reply.png | Bin
.../async.data => }/camel_sync_request_only.png | Bin
.../async.data => }/camel_sync_request_reply.png | Bin
.../images/{images/debugger.data => }/debug.png | Bin
.../images}/jconsole_trace_notifications.png | Bin
.../ROOT/assets/images/message_flow_in_route.png | Bin 0 -> 13415 bytes
.../lifecycle.data => }/service_lifecycle.png | Bin
.../modules/ROOT/pages/architecture.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/async.adoc | 8 +++---
docs/user-manual/modules/ROOT/pages/building.adoc | 4 +--
.../user-manual/modules/ROOT/pages/camel-core.adoc | 6 +++--
docs/user-manual/modules/ROOT/pages/debugger.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/faq.adoc | 22 ---------------
.../using-getin-or-getout-methods-on-exchange.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/jmx.adoc | 4 +--
docs/user-manual/modules/ROOT/pages/lifecycle.adoc | 2 +-
43 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
index 2c2c2da..68b9434 100644
--- a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
+++ b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
@@ -131,7 +131,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::qr-code.png[image]
=== Unmarshalling
diff --git a/components/camel-controlbus/src/main/docs/control_bus.png b/components/camel-controlbus/src/main/docs/control_bus.png
new file mode 100644
index 0000000..e834f65
Binary files /dev/null and b/components/camel-controlbus/src/main/docs/control_bus.png differ
diff --git a/components/camel-controlbus/src/main/docs/controlbus-component.adoc b/components/camel-controlbus/src/main/docs/controlbus-component.adoc
index b87ede2..c9197fc 100644
--- a/components/camel-controlbus/src/main/docs/controlbus-component.adoc
+++ b/components/camel-controlbus/src/main/docs/controlbus-component.adoc
@@ -8,7 +8,7 @@ EIP patterns allows for the
integration system to be monitored and managed from within the
framework.
-image:ControlBus.gif[image]
+image::control_bus.png[image]
Use a Control Bus to manage an enterprise integration system. The
Control Bus uses the same messaging mechanism used by the application
diff --git a/components/camel-directvm/src/main/docs/direct-vm-component.adoc b/components/camel-directvm/src/main/docs/direct-vm-component.adoc
index 25a34da..f05c78d 100644
--- a/components/camel-directvm/src/main/docs/direct-vm-component.adoc
+++ b/components/camel-directvm/src/main/docs/direct-vm-component.adoc
@@ -25,7 +25,7 @@ bundles, the camel routes will use +
the same thread. That autorises to develop applications using
Transactions - Tx.
-image:camel-direct-vm.png[image]
+image::camel-direct-vm.png[image]
== URI format
diff --git a/components/camel-ignite/src/main/docs/ignite.adoc b/components/camel-ignite/src/main/docs/ignite.adoc
index d1143e4..7058d23 100644
--- a/components/camel-ignite/src/main/docs/ignite.adoc
+++ b/components/camel-ignite/src/main/docs/ignite.adoc
@@ -4,7 +4,7 @@
https://ignite.apache.org/[Apache Ignite] In-Memory Data Fabric is a high-performance, integrated and distributed in-memory platform for computing and transacting on large-scale data sets in real-time, orders of magnitude faster than possible with traditional disk-based or flash technologies. It is designed to deliver uncompromised performance for a wide set of in-memory computing use cases from high performance computing, to the industry most advanced data grid, highly available service [...]
-image:apache-ignite.png[]
+image::apache-ignite.png[]
This component offers seven endpoints to cover much of Ignite's functionality:
diff --git a/components/camel-jmx/src/main/docs/jconsole_doubles.PNG b/components/camel-jmx/src/main/docs/jconsole_doubles.PNG
deleted file mode 100644
index 932ad49..0000000
Binary files a/components/camel-jmx/src/main/docs/jconsole_doubles.PNG and /dev/null differ
diff --git a/components/camel-spark/src/main/docs/spark-component.adoc b/components/camel-spark/src/main/docs/spark-component.adoc
index 3409ee1..759f13a 100644
--- a/components/camel-spark/src/main/docs/spark-component.adoc
+++ b/components/camel-spark/src/main/docs/spark-component.adoc
@@ -16,12 +16,12 @@ results of the execution back to the Camel pipeline.
Spark component can be used as a driver application deployed into an
application server (or executed as a fat jar).
-image:camel_spark_driver.png[image]
+image::camel_spark_driver.png[image]
Spark component can also be submitted as a job directly into the Spark
cluster.
-image:camel_spark_cluster.png[image]
+image::camel_spark_cluster.png[image]
While Spark component is primary designed to work as a _long running
job_ serving as an bridge between Spark cluster and the other endpoints,
diff --git a/docs/components/modules/ROOT/assets/images/apache-ignite.png b/docs/components/modules/ROOT/assets/images/apache-ignite.png
new file mode 100644
index 0000000..0f7cf4a
Binary files /dev/null and b/docs/components/modules/ROOT/assets/images/apache-ignite.png differ
diff --git a/docs/components/modules/ROOT/assets/images/camel-direct-vm.png b/docs/components/modules/ROOT/assets/images/camel-direct-vm.png
new file mode 100644
index 0000000..d15f185
Binary files /dev/null and b/docs/components/modules/ROOT/assets/images/camel-direct-vm.png differ
diff --git a/docs/components/modules/ROOT/assets/images/camel_spark_cluster.png b/docs/components/modules/ROOT/assets/images/camel_spark_cluster.png
new file mode 100644
index 0000000..c550bf5
Binary files /dev/null and b/docs/components/modules/ROOT/assets/images/camel_spark_cluster.png differ
diff --git a/docs/components/modules/ROOT/assets/images/camel_spark_driver.png b/docs/components/modules/ROOT/assets/images/camel_spark_driver.png
new file mode 100644
index 0000000..17b6b67
Binary files /dev/null and b/docs/components/modules/ROOT/assets/images/camel_spark_driver.png differ
diff --git a/docs/components/modules/ROOT/assets/images/control_bus.png b/docs/components/modules/ROOT/assets/images/control_bus.png
new file mode 100644
index 0000000..e834f65
Binary files /dev/null and b/docs/components/modules/ROOT/assets/images/control_bus.png differ
diff --git a/docs/components/modules/ROOT/assets/images/images/controlbus-component.data/ControlBus.gif b/docs/components/modules/ROOT/assets/images/images/controlbus-component.data/ControlBus.gif
deleted file mode 100644
index c8b4681..0000000
Binary files a/docs/components/modules/ROOT/assets/images/images/controlbus-component.data/ControlBus.gif and /dev/null differ
diff --git a/docs/components/modules/ROOT/assets/images/qr-code.png b/docs/components/modules/ROOT/assets/images/qr-code.png
new file mode 100644
index 0000000..be0e7c8
Binary files /dev/null and b/docs/components/modules/ROOT/assets/images/qr-code.png differ
diff --git a/docs/components/modules/ROOT/pages/barcode-dataformat.adoc b/docs/components/modules/ROOT/pages/barcode-dataformat.adoc
index 2c2c2da..68b9434 100644
--- a/docs/components/modules/ROOT/pages/barcode-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/barcode-dataformat.adoc
@@ -131,7 +131,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::qr-code.png[image]
=== Unmarshalling
diff --git a/docs/components/modules/ROOT/pages/controlbus-component.adoc b/docs/components/modules/ROOT/pages/controlbus-component.adoc
index b87ede2..c9197fc 100644
--- a/docs/components/modules/ROOT/pages/controlbus-component.adoc
+++ b/docs/components/modules/ROOT/pages/controlbus-component.adoc
@@ -8,7 +8,7 @@ EIP patterns allows for the
integration system to be monitored and managed from within the
framework.
-image:ControlBus.gif[image]
+image::control_bus.png[image]
Use a Control Bus to manage an enterprise integration system. The
Control Bus uses the same messaging mechanism used by the application
diff --git a/docs/components/modules/ROOT/pages/direct-vm-component.adoc b/docs/components/modules/ROOT/pages/direct-vm-component.adoc
index 25a34da..f05c78d 100644
--- a/docs/components/modules/ROOT/pages/direct-vm-component.adoc
+++ b/docs/components/modules/ROOT/pages/direct-vm-component.adoc
@@ -25,7 +25,7 @@ bundles, the camel routes will use +
the same thread. That autorises to develop applications using
Transactions - Tx.
-image:camel-direct-vm.png[image]
+image::camel-direct-vm.png[image]
== URI format
diff --git a/docs/components/modules/ROOT/pages/ignite.adoc b/docs/components/modules/ROOT/pages/ignite.adoc
index d1143e4..7058d23 100644
--- a/docs/components/modules/ROOT/pages/ignite.adoc
+++ b/docs/components/modules/ROOT/pages/ignite.adoc
@@ -4,7 +4,7 @@
https://ignite.apache.org/[Apache Ignite] In-Memory Data Fabric is a high-performance, integrated and distributed in-memory platform for computing and transacting on large-scale data sets in real-time, orders of magnitude faster than possible with traditional disk-based or flash technologies. It is designed to deliver uncompromised performance for a wide set of in-memory computing use cases from high performance computing, to the industry most advanced data grid, highly available service [...]
-image:apache-ignite.png[]
+image::apache-ignite.png[]
This component offers seven endpoints to cover much of Ignite's functionality:
diff --git a/docs/components/modules/ROOT/pages/spark-component.adoc b/docs/components/modules/ROOT/pages/spark-component.adoc
index 3409ee1..759f13a 100644
--- a/docs/components/modules/ROOT/pages/spark-component.adoc
+++ b/docs/components/modules/ROOT/pages/spark-component.adoc
@@ -16,12 +16,12 @@ results of the execution back to the Camel pipeline.
Spark component can be used as a driver application deployed into an
application server (or executed as a fat jar).
-image:camel_spark_driver.png[image]
+image::camel_spark_driver.png[image]
Spark component can also be submitted as a job directly into the Spark
cluster.
-image:camel_spark_cluster.png[image]
+image::camel_spark_cluster.png[image]
While Spark component is primary designed to work as a _long running
job_ serving as an bridge between Spark cluster and the other endpoints,
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 810ce72..22dd7e8 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -29,6 +29,10 @@ function deleteComponentSymlinks() {
return del(['components/modules/ROOT/pages/*', '!components/modules/ROOT/pages/index.adoc']);
}
+function deleteComponentImageSymlinks() {
+ return del(['components/modules/ROOT/assets/images/*']);
+}
+
function createComponentSymlinks() {
return src('../components/{*,*/*}/src/main/docs/*.adoc')
.pipe(map((file, done) => {
@@ -49,6 +53,26 @@ function createComponentSymlinks() {
.pipe(dest('components/modules/ROOT/pages/'));
}
+function createComponentImageSymlinks() {
+ return src('../components/{*,*/*}/src/main/docs/*.png')
+ .pipe(map((file, done) => {
+ // this flattens the output to just .../pages/....adoc
+ // instead of .../pages/camel-.../src/main/docs/....adoc
+ file.base = path.dirname(file.path);
+ done(null, file);
+ }))
+ // Antora disabled symlinks, there is an issue open
+ // https://gitlab.com/antora/antora/issues/188
+ // to reinstate symlink support, until that's resolved
+ // we'll simply copy over instead of creating symlinks
+ // .pipe(symlink('components/modules/ROOT/pages/', {
+ // relativeSymlinks: true
+ // }));
+ // uncomment above .pipe() and remove the .pipe() below
+ // when antora#188 is resolved
+ .pipe(dest('components/modules/ROOT/assets/images/'));
+}
+
function deleteUserManualSymlinks() {
return del(['user-manual/modules/ROOT/pages/*-eip.adoc', 'user-manual/modules/ROOT/pages/*-language.adoc']);
}
@@ -161,7 +185,11 @@ function createComponentExamples() {
.pipe(dest('components/modules/ROOT/examples/'));
}
-const symlinks = parallel(series(deleteComponentSymlinks, createComponentSymlinks), series(deleteUserManualSymlinks, createUserManualSymlinks));
+const symlinks = parallel(
+ series(deleteComponentSymlinks, createComponentSymlinks),
+ series(deleteComponentImageSymlinks, createComponentImageSymlinks),
+ series(deleteUserManualSymlinks, createUserManualSymlinks)
+);
const nav = parallel(createComponentNav, createUserManualNav);
const examples = series(deleteExamples, createUserManualExamples, createComponentExamples);
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/camel-core.data/architecture.png b/docs/user-manual/modules/ROOT/assets/images/architecture.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/camel-core.data/architecture.png
rename to docs/user-manual/modules/ROOT/assets/images/architecture.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/camel-core.data/architecture_incl_violations.png b/docs/user-manual/modules/ROOT/assets/images/architecture_incl_violations.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/camel-core.data/architecture_incl_violations.png
rename to docs/user-manual/modules/ROOT/assets/images/architecture_incl_violations.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/architecture.data/camel-components.png b/docs/user-manual/modules/ROOT/assets/images/camel-components.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/architecture.data/camel-components.png
rename to docs/user-manual/modules/ROOT/assets/images/camel-components.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/building.data/camel-eclipse-m2e-import-completed.png b/docs/user-manual/modules/ROOT/assets/images/camel-eclipse-m2e-import-completed.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/building.data/camel-eclipse-m2e-import-completed.png
rename to docs/user-manual/modules/ROOT/assets/images/camel-eclipse-m2e-import-completed.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/building.data/camel-eclipse-m2e-import.png b/docs/user-manual/modules/ROOT/assets/images/camel-eclipse-m2e-import.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/building.data/camel-eclipse-m2e-import.png
rename to docs/user-manual/modules/ROOT/assets/images/camel-eclipse-m2e-import.png
diff --git a/components/camel-jmx/src/main/docs/camel-jmx.png b/docs/user-manual/modules/ROOT/assets/images/camel-jmx.png
similarity index 100%
rename from components/camel-jmx/src/main/docs/camel-jmx.png
rename to docs/user-manual/modules/ROOT/assets/images/camel-jmx.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/async.data/camel_async_request_only.png b/docs/user-manual/modules/ROOT/assets/images/camel_async_request_only.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/async.data/camel_async_request_only.png
rename to docs/user-manual/modules/ROOT/assets/images/camel_async_request_only.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/async.data/camel_async_request_reply.png b/docs/user-manual/modules/ROOT/assets/images/camel_async_request_reply.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/async.data/camel_async_request_reply.png
rename to docs/user-manual/modules/ROOT/assets/images/camel_async_request_reply.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/async.data/camel_sync_request_only.png b/docs/user-manual/modules/ROOT/assets/images/camel_sync_request_only.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/async.data/camel_sync_request_only.png
rename to docs/user-manual/modules/ROOT/assets/images/camel_sync_request_only.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/async.data/camel_sync_request_reply.png b/docs/user-manual/modules/ROOT/assets/images/camel_sync_request_reply.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/async.data/camel_sync_request_reply.png
rename to docs/user-manual/modules/ROOT/assets/images/camel_sync_request_reply.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/debugger.data/debug.png b/docs/user-manual/modules/ROOT/assets/images/debug.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/debugger.data/debug.png
rename to docs/user-manual/modules/ROOT/assets/images/debug.png
diff --git a/components/camel-jmx/src/main/docs/jconsole_trace_notifications.png b/docs/user-manual/modules/ROOT/assets/images/jconsole_trace_notifications.png
similarity index 100%
rename from components/camel-jmx/src/main/docs/jconsole_trace_notifications.png
rename to docs/user-manual/modules/ROOT/assets/images/jconsole_trace_notifications.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/message_flow_in_route.png b/docs/user-manual/modules/ROOT/assets/images/message_flow_in_route.png
new file mode 100644
index 0000000..07b4637
Binary files /dev/null and b/docs/user-manual/modules/ROOT/assets/images/message_flow_in_route.png differ
diff --git a/docs/user-manual/modules/ROOT/assets/images/images/lifecycle.data/service_lifecycle.png b/docs/user-manual/modules/ROOT/assets/images/service_lifecycle.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/images/lifecycle.data/service_lifecycle.png
rename to docs/user-manual/modules/ROOT/assets/images/service_lifecycle.png
diff --git a/docs/user-manual/modules/ROOT/pages/architecture.adoc b/docs/user-manual/modules/ROOT/pages/architecture.adoc
index 64259ec..f2f4ff5 100644
--- a/docs/user-manual/modules/ROOT/pages/architecture.adoc
+++ b/docs/user-manual/modules/ROOT/pages/architecture.adoc
@@ -37,4 +37,4 @@ xref:parameter-binding-annotations.adoc[Annotation Based Expression Language].
[[Architecture-Diagram]]
== Diagram
-image:images/architecture.data/camel-components.png[image]
+image::camel-components.png[image]
diff --git a/docs/user-manual/modules/ROOT/pages/async.adoc b/docs/user-manual/modules/ROOT/pages/async.adoc
index a864910..be7b779 100644
--- a/docs/user-manual/modules/ROOT/pages/async.adoc
+++ b/docs/user-manual/modules/ROOT/pages/async.adoc
@@ -69,7 +69,7 @@ A synchronous exchange is defined as the caller sends a message and
waits until its complete before continuing. This is illustrated in the
diagram below:
-image:async.data/camel_sync_request_reply.png[image]
+image::camel_sync_request_reply.png[image]
\1. The client sends a sync Request Reply
message over xref:components::http-component.adoc[HTTP] to Camel. The client application will
@@ -89,7 +89,7 @@ the asynchronous thread. Then the caller can continue doing other work
and at the same time the asynchronous thread is processing the message.
This is illustrated in the diagram below:
-image:async.data/camel_async_request_reply.png[image]
+image::camel_async_request_reply.png[image]
1. The client sends an Async
Request Reply message over HTTP
@@ -110,7 +110,7 @@ Camel. The client sends a message to Camel in which a reply is not
expected. However the client still waits until the message is processed
completely. This is illustrated in the diagram below:
-image:async.data/camel_sync_request_only.png[image]
+image::camel_sync_request_only.png[image]
\1. The client sends a Request only and we can
still use xref:components::http-component.adoc[HTTP] despite http being
@@ -138,7 +138,7 @@ of the message to complete. In this case the client can immediately
continue doing other work while the message is being routed and
processed in Camel. This is illustrated in the diagram below:
-image:async.data/camel_async_request_only.png[image]
+image::camel_async_request_only.png[image]
\1. The client sends a Request only and we can
still use xref:components::http-component.adoc[HTTP] despite http being
diff --git a/docs/user-manual/modules/ROOT/pages/building.adoc b/docs/user-manual/modules/ROOT/pages/building.adoc
index a0c7e14..89e32b9 100644
--- a/docs/user-manual/modules/ROOT/pages/building.adoc
+++ b/docs/user-manual/modules/ROOT/pages/building.adoc
@@ -137,14 +137,14 @@ Import -> Maven -> Existing Maven Projects*. Point the wizard to the
root directory of the cloned repository. Eclipse will analyze all Camel
projects and eventually present the following summary:
-image:building.data/camel-eclipse-m2e-import.png[image]
+image::camel-eclipse-m2e-import.png[image]
Simply confirm the import of all projects by clicking *Finish*. The
import process will create Eclipse projects and automatically set up
build paths using dependency details provided by the pom.xml files. Once
completed, all Camel projects will be available in your workspace:
-image:building.data/camel-eclipse-m2e-import-completed.png[image]
+image::camel-eclipse-m2e-import-completed.png[image]
NOTE: As you can see main project is combined with multiple sub projects/modules (e.g. components, archetypes, tooling etc.). Many sub projects/modules are again categorized or packaged with another layer of sub modules and so on. Developers can import project/module which is relevant to them and work on it instead importing entire project which will consume memory and eventually slow down Eclipse. This approach is not only easy to import and work in eclipse as well as easy to test. Lets [...]
diff --git a/docs/user-manual/modules/ROOT/pages/camel-core.adoc b/docs/user-manual/modules/ROOT/pages/camel-core.adoc
index cea51d5..0f4165d 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-core.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-core.adoc
@@ -41,7 +41,9 @@ Architecture Diagram
The diagram shows the (relaxed) layering of the top level packages in
camel-core. Relaxed means that a layer may reference any layer below
-it.image:camel-core.data/architecture.png[image]
+it.
+
+image::architecture.png[image]
[[Camel-Core-ArchitectureDiagramincludingcurrentviolations]]
Architecture Diagram including current violations
@@ -54,4 +56,4 @@ have an offer from the manufacturer headway software to supply us with
licenses for all camel developers that are interested. If you want a
license please contact me (Christian Schneider chris at
die-schneider.net). I will then try to organize a license for you. +
- image:camel-core.data/architecture_incl_violations.png[image]
+ image::architecture_incl_violations.png[image]
diff --git a/docs/user-manual/modules/ROOT/pages/debugger.adoc b/docs/user-manual/modules/ROOT/pages/debugger.adoc
index bfe6769..6f64c4b 100644
--- a/docs/user-manual/modules/ROOT/pages/debugger.adoc
+++ b/docs/user-manual/modules/ROOT/pages/debugger.adoc
@@ -107,5 +107,5 @@ parameters. +
Notice how we can see that the message is to be send to the "mock:a"
endpoint.
-image:debugger.data/debug.png[image]
+image::debug.png[image]
diff --git a/docs/user-manual/modules/ROOT/pages/faq.adoc b/docs/user-manual/modules/ROOT/pages/faq.adoc
index bf587bc..9ca7437 100644
--- a/docs/user-manual/modules/ROOT/pages/faq.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq.adoc
@@ -168,25 +168,3 @@ Common Problems that people have when riding the Camel
* xref:faq/why-does-camel-use-too-many-threads-with-producertemplate.adoc[Why does Camel use too many threads with ProducerTemplate?]
* xref:faq/why-does-maven-not-download-dependencies.adoc[Why does maven not download dependencies?]
-[[FAQ-Acknowledgement]]
-== Acknowledgement
-
-Many thanks to the following organizations for helping the Camel
-project.
-
-[width="100%",cols="50%,50%",]
-|=======================================================================
-|image:http://www.structure101.com/structure101-java/images/webapp.gif[image]
-|http://www.headwaysoftware.com/[Headway Software] provided free
-licenses of
-http://www.headwaysoftware.com/products/structure101/index.php[Structure101]
-for analyzing and managing the
-http://www.structure101.com/structure101-java/tracker/camel/1.2.0/summary.html[architecture
-of Camel] Java code.
-
-|image:https://www.yourkit.com/images/yk_logo.png[image]
-|https://www.yourkit.com/[YourKit], LLC kindly provide free licenses for
-the YourKit Java Profiler to open source projects. YourKit Java Profiler
-is primarily used to investigate performance and memory leak issues
-reported in Apache Camel.
-|=======================================================================
diff --git a/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc b/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc
index 77de723..43905ae 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/using-getin-or-getout-methods-on-exchange.adoc
@@ -20,7 +20,7 @@ message.
[[UsinggetInorgetOutmethodsonExchange-Flowofanexchangethrougharoute]]
== Flow of an exchange through a route
-image:images/using-getin-or-getout-methods-on-exchange.data/Message-flow-in-Route.png[image]
+image::message_flow_in_route.png[image]
* The out message from each step is used as the in message for the next
step
diff --git a/docs/user-manual/modules/ROOT/pages/jmx.adoc b/docs/user-manual/modules/ROOT/pages/jmx.adoc
index 6f8affe..34c854c 100644
--- a/docs/user-manual/modules/ROOT/pages/jmx.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jmx.adoc
@@ -496,7 +496,7 @@ localhost `URL:service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi/camel`.
Using the Apache Camel with JConsole:
-image:camel-jmx.png[image]
+image::camel-jmx.png[image]
== Which endpoints are registered
@@ -572,7 +572,7 @@ Now you can register for TraceEvent Notifications on the Tracer MBean
using JConsole. There will be one Notification for every step on the
route with all exchange and message details:
-image:jconsole_trace_notifications.png[image]
+image::jconsole_trace_notifications.png[image]
== Using JMX for your own Camel Code
diff --git a/docs/user-manual/modules/ROOT/pages/lifecycle.adoc b/docs/user-manual/modules/ROOT/pages/lifecycle.adoc
index 6f7524d..1b8b75f 100644
--- a/docs/user-manual/modules/ROOT/pages/lifecycle.adoc
+++ b/docs/user-manual/modules/ROOT/pages/lifecycle.adoc
@@ -59,7 +59,7 @@ resuming.
A service (`org.apache.camel.Service`) in Camel adheres to the following
lifecycle states as illustrated in the diagram below:
-image:lifecycle.data/service_lifecycle.png[image]
+image::service_lifecycle.png[image]
*Notice:* A service can optimally support suspend/resume by the
`org.apache.camel.SuspendableService`. This means not all services in