This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 524c0f4 Add fhir data formats to docs
524c0f4 is described below
commit 524c0f4746d7186cdd1ab211456193c04f5c2043
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Oct 29 12:19:29 2018 +0100
Add fhir data formats to docs
---
camel-core/readme.adoc | 2 +-
components/readme.adoc | 6 +++++-
docs/user-manual/en/SUMMARY.md | 4 +++-
.../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 4 ++++
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc
index 2176322..ee5e23a 100644
--- a/camel-core/readme.adoc
+++ b/camel-core/readme.adoc
@@ -106,7 +106,7 @@ Data Formats
// dataformats: START
-Number of Data Formats: 4 in 39 JAR artifacts (4 deprecated)
+Number of Data Formats: 4 in 40 JAR artifacts (4 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
diff --git a/components/readme.adoc b/components/readme.adoc
index d6b893d..cbb9429 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -922,7 +922,7 @@ Data Formats
^^^^^^^^^^^^
// dataformats: START
-Number of Data Formats: 48 in 39 JAR artifacts (4 deprecated)
+Number of Data Formats: 50 in 40 JAR artifacts (4 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -952,6 +952,10 @@ Number of Data Formats: 48 in 39 JAR artifacts (4
deprecated)
| link:camel-csv/src/main/docs/csv-dataformat.adoc[CSV] (camel-csv) | 1.3 |
The CSV data format is used for handling CSV payloads.
+|
link:camel-fhir/camel-fhir-component/src/main/docs/fhirJson-dataformat.adoc[FHIR
JSon] (camel-fhir) | 2.21 | The FHIR JSon data format is used to
marshall/unmarshall to/from FHIR objects to/from JSON.
+
+|
link:camel-fhir/camel-fhir-component/src/main/docs/fhirXml-dataformat.adoc[FHIR
XML] (camel-fhir) | 2.21 | The FHIR XML data format is used to
marshall/unmarshall from/to FHIR objects to/from XML.
+
| link:camel-flatpack/src/main/docs/flatpack-dataformat.adoc[Flatpack]
(camel-flatpack) | 2.1 | The Flatpack data format is used for working with flat
payloads (such as CSV, delimited, or fixed length formats).
| link:../camel-core/src/main/docs/gzip-dataformat.adoc[GZip] (camel-core) |
2.0 | The GZip data format is a message compression and de-compression format
(which works with the popular gzip/gunzip tools).
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 2ba1c10..68c39c6 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -62,7 +62,7 @@
* [How to run Camel in an OSGi container]
* [Using OSGi blueprint with Camel]
* [Working with Camel and SCR]
-* Working with REST and�[Rest DSL]
+* Working with REST and [Rest DSL]
### [Examples](examples.adoc)
@@ -511,6 +511,8 @@
* [Castor](castor-dataformat.adoc)
* [Crypto (Java Cryptographic Extension)](crypto-dataformat.adoc)
* [CSV](csv-dataformat.adoc)
+ * [FHIR JSon](fhirJson-dataformat.adoc)
+ * [FHIR XML](fhirXml-dataformat.adoc)
* [Flatpack](flatpack-dataformat.adoc)
* [GZip](gzip-dataformat.adoc)
* [Hessian](hessian-dataformat.adoc)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index c7b691f..d0f3964 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -553,6 +553,10 @@ public class PrepareCatalogMojo extends AbstractMojo {
File[] dataFormats = componentsDir.listFiles();
if (dataFormats != null) {
for (File dir : dataFormats) {
+ // special for this as the data format is in the sub dir
+ if (dir.isDirectory() &&
"camel-fhir".equals(dir.getName())) {
+ dir = new File(dir, "camel-fhir-component");
+ }
if (dir.isDirectory() && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
findDataFormatFilesRecursive(target, jsonFiles,
dataFormatFiles, new CamelDataFormatsFileFilter());
