This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 7766253 CAMEL-16861: Cleanup docs
7766253 is described below
commit 776625358703896c0bc51fa7625bf4ed580e9712
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Nov 1 16:36:12 2021 +0100
CAMEL-16861: Cleanup docs
---
.../ROOT/assets/images/camel-components.png | Bin 229901 -> 0 bytes
.../assets/images/images/camel-architecture.png | Bin 0 -> 96105 bytes
.../ROOT/assets/images/{ => images}/debug.png | Bin
.../images/{ => images}/service_lifecycle.png | Bin
.../ROOT/assets/images/message_flow_in_route.png | Bin 13415 -> 0 bytes
.../modules/ROOT/pages/architecture.adoc | 74 ++++++++++-----------
docs/user-manual/modules/ROOT/pages/debugger.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/lifecycle.adoc | 2 +-
8 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/assets/images/camel-components.png
b/docs/user-manual/modules/ROOT/assets/images/camel-components.png
deleted file mode 100644
index c9aa663..0000000
Binary files a/docs/user-manual/modules/ROOT/assets/images/camel-components.png
and /dev/null differ
diff --git
a/docs/user-manual/modules/ROOT/assets/images/images/camel-architecture.png
b/docs/user-manual/modules/ROOT/assets/images/images/camel-architecture.png
new file mode 100644
index 0000000..5e94179
Binary files /dev/null and
b/docs/user-manual/modules/ROOT/assets/images/images/camel-architecture.png
differ
diff --git a/docs/user-manual/modules/ROOT/assets/images/debug.png
b/docs/user-manual/modules/ROOT/assets/images/images/debug.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/debug.png
rename to docs/user-manual/modules/ROOT/assets/images/images/debug.png
diff --git a/docs/user-manual/modules/ROOT/assets/images/service_lifecycle.png
b/docs/user-manual/modules/ROOT/assets/images/images/service_lifecycle.png
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/service_lifecycle.png
rename to
docs/user-manual/modules/ROOT/assets/images/images/service_lifecycle.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
deleted file mode 100644
index 07b4637..0000000
Binary files
a/docs/user-manual/modules/ROOT/assets/images/message_flow_in_route.png and
/dev/null differ
diff --git a/docs/user-manual/modules/ROOT/pages/architecture.adoc
b/docs/user-manual/modules/ROOT/pages/architecture.adoc
index 9107cb9..8d52d29 100644
--- a/docs/user-manual/modules/ROOT/pages/architecture.adoc
+++ b/docs/user-manual/modules/ROOT/pages/architecture.adoc
@@ -1,39 +1,39 @@
= Architecture
-Camel uses a Java based xref:dsl.adoc[Routing Domain Specific Language (DSL)]
-or an XML Configuration to configure
-routing and mediation rules which are added to a
-https://www.javadoc.io/doc/org.apache.camel/camel-api/current/org/apache/camel/CamelContext.html[CamelContext]
-to implement the various
-xref:components:eips:enterprise-integration-patterns.adoc[Enterprise
Integration Patterns].
-
-At a high level Camel consists of a
-https://www.javadoc.io/doc/org.apache.camel/camel-api/current/org/apache/camel/CamelContext.html[CamelContext]
-which contains a collection of Component instances.
-A Component is essentially a factory of
-Endpoint instances. You can explicitly configure
-Component instances in Java code or an IoC
-container like Spring, or they can be auto-discovered using
-URIs.
-
-An Endpoint acts rather like a URI or URL in a web
-application or a Destination in a JMS system; you can communicate with
-an endpoint; either sending messages to it or consuming messages from
-it. You can then create a
-https://www.javadoc.io/doc/org.apache.camel/camel-api/current/org/apache/camel/Producer.html[Producer]
-or
-https://www.javadoc.io/doc/org.apache.camel/camel-api/current/org/apache/camel/Consumer.html[Consumer]
-on an Endpoint to exchange messages with it.
-
-The xref:dsl.adoc[Camel Domain Specific Language] makes heavy use of pluggable
-xref:languages.adoc[Languages] to create an
-xref:expression.adoc[Expression] or xref:predicate.adoc[Predicate] to
-make a truly powerful DSL which is extensible to the most suitable
-language depending on your needs. Many of the Languages
-are also supported as
-xref:parameter-binding-annotations.adoc[Annotation Based Expression Language].
-
-[[Architecture-Diagram]]
-== Diagram
-
-image::camel-components.png[image]
+The following diagram shows a high-level view of the main concepts that make
up Camel's architecture.
+
+image::images/camel-architecture.png[image]
+
+At the center of the diagram you have the _heart_ of Apache Camel; the
xref:camelcontext.adoc[CamelContext].
+The `CamelContext` is "Camel" ... the runtime Camel, that contains and holds
everything together.
+
+xref:routes.adoc[Routes] are defined using one of Camel’s xref:dsl.adoc[DSLs].
+xref:processor.adoc[Processors] are used to transform and
+manipulate messages during routing as well as to implement all the
+xref:components:eips:enterprise-integration-patterns.adoc[EIP]s, which have
+corresponding names in the DSLs. xref:component.adoc[Components] are the
extension points in Camel
+for adding connectivity to other systems. To expose these systems to the rest
of Camel,
+components provide an xref:endpoint.adoc[endpoint] interface.
+
+== Routes 101
+
+You use Camel for integration, and a key concept in Camel is
xref:routes.adoc[routes] which
+tells Camel how messages should be routed between systems.
+
+A route has exactly one input xref:endpoint.adoc[endpoint],
+and 0, 1 or more output xref:endpoint.adoc[endpoints].
+
+You use Camel xref:dsl.adoc[DSL] to _code_ the xref:routes.adoc[routes].
+For example the route below is coded in xref:java-dsl.adoc[Java DSL]:
+
+[source,java]
+----
+public class MyRoute extends RouteBuilder {
+
+ public void configure() throws Exception {
+ from("ftp:myserver/folder")
+ .to("activemq:queue:cheese");
+ }
+}
+----
+
diff --git a/docs/user-manual/modules/ROOT/pages/debugger.adoc
b/docs/user-manual/modules/ROOT/pages/debugger.adoc
index b1463e7..6d02e6f 100644
--- a/docs/user-manual/modules/ROOT/pages/debugger.adoc
+++ b/docs/user-manual/modules/ROOT/pages/debugger.adoc
@@ -75,7 +75,7 @@ The IDE (IDEA) has hit the breakpoint and we can inspect the
parameters. Notice how we can see that the message is to be send to the
"mock:a"
endpoint.
-image::debug.png[image]
+image::images/debug.png[image]
== Implementing a custom debugger
diff --git a/docs/user-manual/modules/ROOT/pages/lifecycle.adoc
b/docs/user-manual/modules/ROOT/pages/lifecycle.adoc
index 1fabe04..2d555f7 100644
--- a/docs/user-manual/modules/ROOT/pages/lifecycle.adoc
+++ b/docs/user-manual/modules/ROOT/pages/lifecycle.adoc
@@ -47,7 +47,7 @@ so you can control Camel from JMX management.
A service (`org.apache.camel.Service`) in Camel adheres to the following
lifecycle states as illustrated in the diagram below:
-image::service_lifecycle.png[image]
+image::images/service_lifecycle.png[image]
The `org.apache.camel.support.service.ServiceSupport` is a good base class to
extend for custom services as it offers the basic functionally to keep
