You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/08/19 08:10:31 UTC
[1/2] camel git commit: CAMEL-9541: Fix links to bindy doc as there
is one shared doc
Repository: camel
Updated Branches:
refs/heads/master 66e07ee27 -> 60d1c7c54
CAMEL-9541: Fix links to bindy doc as there is one shared doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f01ed545
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f01ed545
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f01ed545
Branch: refs/heads/master
Commit: f01ed54530b6c8bb19a2cf00d891744b29f69052
Parents: 66e07ee
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Aug 19 10:04:58 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Aug 19 10:04:58 2016 +0200
----------------------------------------------------------------------
components/camel-bindy/src/main/docs/bindy-dataformat.adoc | 6 ++++++
components/readme.adoc | 8 +++++---
.../org/apache/camel/maven/packaging/PrepareReadmeMojo.java | 6 ++++++
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f01ed545/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
index 309d422..59aa943 100644
--- a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
+++ b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
@@ -62,6 +62,9 @@ Options
+
+
+
// dataformat options: START
The Bindy dataformat supports 3 options which are listed below.
@@ -86,6 +89,9 @@ The Bindy dataformat supports 3 options which are listed below.
+
+
+
[[Bindy-Annotations]]
Annotations
~~~~~~~~~~~
http://git-wip-us.apache.org/repos/asf/camel/blob/f01ed545/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 4f81729..8871867 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -553,6 +553,7 @@ Data Formats
+
// dataformats: START
[width="100%",cols="4,6",options="header"]
|=======================================================================
@@ -566,11 +567,11 @@ Data Formats
| link:camel-beanio/src/main/docs/beanio-dataformat.adoc[BeanIO] (camel-beanio) | Camel BeanIO data format support
-| link:camel-bindy/src/main/docs/bindy-csv-dataformat.adoc[Bindy CSV] (camel-bindy) | Camel Bindy data format support
+| link:camel-bindy/src/main/docs/bindy-dataformat.adoc[Bindy CSV] (camel-bindy) | Camel Bindy data format support
-| link:camel-bindy/src/main/docs/bindy-fixed-dataformat.adoc[Bindy Fixed Length] (camel-bindy) | Camel Bindy data format support
+| link:camel-bindy/src/main/docs/bindy-dataformat.adoc[Bindy Fixed Length] (camel-bindy) | Camel Bindy data format support
-| link:camel-bindy/src/main/docs/bindy-kvp-dataformat.adoc[Bindy Key Value Pair] (camel-bindy) | Camel Bindy data format support
+| link:camel-bindy/src/main/docs/bindy-dataformat.adoc[Bindy Key Value Pair] (camel-bindy) | Camel Bindy data format support
| link:camel-boon/src/main/docs/boon-dataformat.adoc[Boon] (camel-boon) | Camel Boon support
@@ -646,6 +647,7 @@ Data Formats
+
Expression Languages
^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/f01ed545/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index c9a38b4..aa62bb8 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -202,6 +202,12 @@ public class PrepareReadmeMojo extends AbstractMojo {
for (File file : dataFormatFiles) {
String json = loadText(new FileInputStream(file));
DataFormatModel model = generateDataFormatModel(json);
+
+ // special for bindy as we have one common file
+ if (model.getName().startsWith("bindy")) {
+ model.setName("bindy");
+ }
+
models.add(model);
}
[2/2] camel git commit: CAMEL-9541: Avoid extra empty lines when
updating readme files.
Posted by da...@apache.org.
CAMEL-9541: Avoid extra empty lines when updating readme files.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/60d1c7c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60d1c7c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60d1c7c5
Branch: refs/heads/master
Commit: 60d1c7c541f6fa1aab05a0c7f59831d92500c9a6
Parents: f01ed54
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Aug 19 10:08:36 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Aug 19 10:08:36 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/maven/packaging/PrepareReadmeMojo.java | 6 +++---
.../apache/camel/maven/packaging/PrepareUserGuideMojo.java | 8 ++++----
.../apache/camel/maven/packaging/ReadmeComponentMojo.java | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/60d1c7c5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index aa62bb8..44bd179 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -361,7 +361,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "// components: START");
String after = StringHelper.after(text, "// components: END");
- text = before + "\n// components: START\n" + changed + "\n// components: END\n" + after;
+ text = before + "// components: START\n" + changed + "\n// components: END" + after;
writeText(file, text);
return true;
}
@@ -395,7 +395,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "// dataformats: START");
String after = StringHelper.after(text, "// dataformats: END");
- text = before + "\n// dataformats: START\n" + changed + "\n// dataformats: END\n" + after;
+ text = before + "// dataformats: START\n" + changed + "\n// dataformats: END" + after;
writeText(file, text);
return true;
}
@@ -429,7 +429,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "// languages: START");
String after = StringHelper.after(text, "// languages: END");
- text = before + "\n// languages: START\n" + changed + "\n// languages: END\n" + after;
+ text = before + "// languages: START\n" + changed + "\n// languages: END" + after;
writeText(file, text);
return true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/60d1c7c5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
index 44c46ce..88697be 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
@@ -279,7 +279,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "<!-- core components: START -->");
String after = StringHelper.after(text, "<!-- core components: END -->");
- text = before + "\n<!-- core components: START -->\n" + changed + "\n<!-- core components: END -->\n" + after;
+ text = before + "<!-- core components: START -->\n" + changed + "\n<!-- core components: END -->" + after;
writeText(file, text);
return true;
}
@@ -313,7 +313,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "<!-- components: START -->");
String after = StringHelper.after(text, "<!-- components: END -->");
- text = before + "\n<!-- components: START -->\n" + changed + "\n<!-- components: END -->\n" + after;
+ text = before + "<!-- components: START -->\n" + changed + "\n<!-- components: END -->" + after;
writeText(file, text);
return true;
}
@@ -347,7 +347,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "<!-- dataformats: START -->");
String after = StringHelper.after(text, "<!-- dataformats: END -->");
- text = before + "\n<!-- dataformats: START -->\n" + changed + "\n<!-- dataformats: END -->\n" + after;
+ text = before + "<!-- dataformats: START -->\n" + changed + "\n<!-- dataformats: END -->" + after;
writeText(file, text);
return true;
}
@@ -381,7 +381,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "<!-- languages: START -->");
String after = StringHelper.after(text, "<!-- languages: END -->");
- text = before + "\n<!-- languages: START -->\n" + changed + "\n<!-- languages: END -->\n" + after;
+ text = before + "<!-- languages: START -->\n" + changed + "\n<!-- languages: END -->" + after;
writeText(file, text);
return true;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/60d1c7c5/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java
index a4a7013..e1583e3 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java
@@ -275,7 +275,7 @@ public class ReadmeComponentMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "// component options: START");
String after = StringHelper.after(text, "// component options: END");
- text = before + "\n// component options: START\n" + changed + "\n// component options: END\n" + after;
+ text = before + "// component options: START\n" + changed + "\n// component options: END" + after;
writeText(file, text);
return true;
}
@@ -309,7 +309,7 @@ public class ReadmeComponentMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "// endpoint options: START");
String after = StringHelper.after(text, "// endpoint options: END");
- text = before + "\n// endpoint options: START\n" + changed + "\n// endpoint options: END\n" + after;
+ text = before + "// endpoint options: START\n" + changed + "\n// endpoint options: END" + after;
writeText(file, text);
return true;
}
@@ -343,7 +343,7 @@ public class ReadmeComponentMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "// dataformat options: START");
String after = StringHelper.after(text, "// dataformat options: END");
- text = before + "\n// dataformat options: START\n" + changed + "\n// dataformat options: END\n" + after;
+ text = before + "// dataformat options: START\n" + changed + "\n// dataformat options: END" + after;
writeText(file, text);
return true;
}
@@ -377,7 +377,7 @@ public class ReadmeComponentMojo extends AbstractMojo {
} else {
String before = StringHelper.before(text, "// language options: START");
String after = StringHelper.after(text, "// language options: END");
- text = before + "\n// language options: START\n" + changed + "\n// language options: END\n" + after;
+ text = before + "// language options: START\n" + changed + "\n// language options: END" + after;
writeText(file, text);
return true;
}