Skip to content

Commit 04037e0

Browse files
authored
Merge pull request #7 from apupier/fixTypos
Fix typos
2 parents 1d6a14a + 6e43648 commit 04037e0

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

documentation/modules/ROOT/pages/02-architecture.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
= Architecture
77

88
The solution pattern leverages preconfigured, ready-to-use Quarkus and Spring Boot templates.
9-
Those templates contains placeholders where code and configration just need to be copy-pasted from the legacy application.
9+
Those templates contains placeholders where code and configuration just need to be copy-pasted from the legacy application.
1010

1111

1212
== Common Challenges
@@ -40,11 +40,11 @@ Camel-based integration logic can be written in XML or Java, and can behave as a
4040

4141
The present demo will take a legacy API developed in JBoss Fuse 6.2 on Karaf, in Blueprint XML.
4242
It's suggested that such an application targets the Quarkus runtime.
43-
The provided Quarkus template is 100% compatible with Camel K, so the resutling migrated application is immediately ready to be added to a serverless stack.
43+
The provided Quarkus template is 100% compatible with Camel K, so the resulting migrated application is immediately ready to be added to a serverless stack.
4444

4545
The material can be used to migrate any Fuse 6 or 7 distribution to the Red Hat build of Apache Camel.
4646
The demos will however focus on migrating a Fuse 6 application, and more concretely a Camel v2.17 one, in Blueprint XML format, running on Karaf 2. The XML format will be converted to the optimized IO XML one.
47-
This path has been chosen for the demonstration because it can be considered the hardest one. Applications running on Fuse 7, no matter which distribution, could use the same approach and will bnefit from a shortest migration effort.
47+
This path has been chosen for the demonstration because it can be considered the hardest one. Applications running on Fuse 7, no matter which distribution, could use the same approach and will benefit from a shortest migration effort.
4848

4949
In general, the following migration strategy should be considered:
5050

documentation/modules/ROOT/pages/03-demo.adoc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Next, you can learn how to walkthrough this demo.
4848
=== Before getting started
4949
To try out, you'll need Maven, and it's best to have a Java 17 runtime. +
5050
Maven needs to have access to the repository "https://maven.repository.redhat.com/ga/" for the dependencies. +
51-
To make things easier, it's better to use a visual Java IDE, such as Eclipse, Vscode...
51+
To make things easier, it's better to use a visual Java IDE, such as Eclipse, VS Code...
5252

5353
=== Setup
5454
First, clone the repository: +
@@ -63,7 +63,7 @@ Enter the repository and switch to the 4.0 branch. +
6363
==== Getting the source application
6464
The demoed example is a migration of a CXF-based REST API implemented using FUSE 6 +
6565
The source code of that legacy application in the /fuse6-apps directory, under /rest/claimdemo +
66-
In the rest of the document, this location will be refered to as $SOURCE +
66+
In the rest of the document, this location will be referred to as $SOURCE +
6767

6868
$ SOURCE=./fuse6-apps/rest/claimdemo
6969

@@ -78,7 +78,7 @@ This application listens to API calls at http://localhost:8182/cxf/status/status
7878
==== Identifying the target for the migration
7979
The present document will describe how to migrate the application to the Camel Extension for Quarkus runtime. +
8080
We'll therefore start with the template located in the templates/rest/ceq-xml-rest-app directory. +
81-
For the rest of the document, this location will be refered to as $TARGET +
81+
For the rest of the document, this location will be referred to as $TARGET +
8282

8383
$ TARGET=./templates/rest/ceq-xml-rest-app
8484

@@ -91,7 +91,7 @@ Here below, we'll call this namespace 'claimdemo-migration'.
9191
==== Preparing Camel K (optional)
9292
If you want to test the migrated application as a serverless component, you'll need an Openshift server with Camel K installed. +
9393
Install the Red Hat Camel K Operator to your Openshift cluster.
94-
Optionaly you can also deploy the Openshift Serverless (Knative Serving and Knative Eventing) operators. +
94+
Optionally you can also deploy the Openshift Serverless (Knative Serving and Knative Eventing) operators. +
9595
Make sure you also have the kamel CLI on your local machine, and of the same version as the Camel K Operator. +
9696
For clarity, we'll use a separate namespace for Camel K-related artefacts. Let's call it camel-migration. +
9797

@@ -134,7 +134,7 @@ To complete it, proceed to follow the below steps.
134134

135135
$ cp -r $SOURCE/src/main/java $TARGET/src/main/
136136

137-
.. You can optionaly remove the Service interface, which is a class used specifically by the CXFRS framework, which is no longer the framework supporting REST API in Camel 3.
137+
.. You can optionally remove the Service interface, which is a class used specifically by the CXFRS framework, which is no longer the framework supporting REST API in Camel 3.
138138

139139
$ rm $TARGET/src/main/java/org/blogdemo/claimdemo/StatusService.java
140140

@@ -155,8 +155,8 @@ Therefore, add the below annotation to that Java class:
155155
+
156156
[NOTE]
157157
====
158-
The Camel CXFRS component has been removed from Camel since v3. Camel now relies on the Camel REST component for the implementation of REST API endpoints. This provides separation of concerns between th REST interface and the REST implementation. It's recommended to generate the REST interface from an OpenAPI specification. +
159-
Camel ships a Maven plugin to automate th creation of the required code from the openAPI document. +
158+
The Camel CXFRS component has been removed from Camel since v3. Camel now relies on the Camel REST component for the implementation of REST API endpoints. This provides separation of concerns between the REST interface and the REST implementation. It's recommended to generate the REST interface from an OpenAPI specification. +
159+
Camel ships a Maven plugin to automate the creation of the required code from the openAPI document. +
160160
====
161161
+
162162
.. Copy the OpenAPI spec to the Maven project and run the Maven plugin. +
@@ -180,7 +180,7 @@ Camel ships a Maven plugin to automate th creation of the required code from the
180180
<from id="_from4" uri="direct://getCustById"/>
181181

182182
. *Final consideration upon CXFRS*
183-
.. The CXFRS library, based on the CXF framework initially designed for SOAP, made use of the saop-related "operationName" header to identify the target Java method to call. +
183+
.. The CXFRS library, based on the CXF framework initially designed for SOAP, made use of the soap-related "operationName" header to identify the target Java method to call. +
184184
This is not needed anymore, as the implementation now relies on the Camel REST library. +
185185
.. To makes the application forward compatible to new clients, it's best to get rid of that header constraints. +
186186
An easy (quick & dirty) way to do that is by replacing the condition in the camel route as follows:
@@ -220,8 +220,8 @@ To run it and test it on Openshift:
220220
==== Turning the migrated application into a Camel K serverless function
221221
The template makes use of the new IO XML format, which makes the migrated application immediately compatible with Camel K. +
222222

223-
As mentioned, with Camel K, the Java dependencies (custom Camel processor) need to be made externaly available, for example thanks to a Nexus repository +
224-
To do that, you can use the helpers found in the Camel K template directory, which will be refered to as $CAMELK +
223+
As mentioned, with Camel K, the Java dependencies (custom Camel processor) need to be made externally available, for example thanks to a Nexus repository +
224+
To do that, you can use the helpers found in the Camel K template directory, which will be referred to as $CAMELK +
225225

226226
$ CAMELK=./templates/camelk
227227

@@ -255,7 +255,7 @@ To do that, you first need to edit the pom.xml and correct the URL of the Nexus
255255
You'll have to make sure that you have permission to write to the Nexus repository. +
256256
This means you will need to make an authenticated call to the Nexus server. +
257257
Credentials information are located in the settings.xml linked to your local Nexus (not the one we used to create a ConfigMap). +
258-
Your local file sould contain a <server> entry with the exact same "id" as the one listed in the pom.xml +
258+
Your local file should contain a <server> entry with the exact same "id" as the one listed in the pom.xml +
259259

260260
<server>
261261
<id>nexus-camel</id>

0 commit comments

Comments
 (0)