camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/6] camel git commit: CAMEL-9541: Generate readme for dataformat also.
Date Tue, 16 Aug 2016 09:17:06 GMT
http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-xstream/src/main/docs/xstream.adoc
----------------------------------------------------------------------
diff --git a/components/camel-xstream/src/main/docs/xstream.adoc b/components/camel-xstream/src/main/docs/xstream.adoc
deleted file mode 100644
index 14ce541..0000000
--- a/components/camel-xstream/src/main/docs/xstream.adoc
+++ /dev/null
@@ -1,124 +0,0 @@
-[[XStream-XStream]]
-XStream
-~~~~~~~
-
-XStream is a link:data-format.html[Data Format] which uses the
-http://xstream.codehaus.org/[XStream library] to marshal and unmarshal
-Java objects to and from XML.
-
-To use XStream in your camel routes you need to add the a dependency
-on *camel-xstream* which implements this data format.
-
-Maven users will need to add the following dependency to their
-`pom.xml` for this component:
-
-[source,xml]
-----------------------------------------------------------
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-xstream</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel core version -->
-</dependency>
-----------------------------------------------------------
-
-[[XStream-UsingtheJavaDSL]]
-Using the Java DSL
-^^^^^^^^^^^^^^^^^^
-
-[source,java]
------------------------------------------------------------
-// lets turn Object messages into XML then send to MQSeries
-from("activemq:My.Queue").
-  marshal().xstream().
-  to("mqseries:Another.Queue");
------------------------------------------------------------
-
-If you would like to configure the `XStream` instance used by the Camel
-for the message transformation, you can simply pass a reference to that
-instance on the DSL level.
-
-[source,java]
----------------------------------------------------------
-XStream xStream = new XStream();
-xStream.aliasField("money", PurchaseOrder.class, "cash");
-// new Added setModel option since Camel 2.14
-xStream.setModel("NO_REFERENCES");
-...
-
-from("direct:marshal").
-  marshal(new XStreamDataFormat(xStream)).
-  to("mock:marshaled");
----------------------------------------------------------
-
-[[XStream-XMLInputFactoryandXMLOutputFactory]]
-XMLInputFactory and XMLOutputFactory
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-http://xstream.codehaus.org/[The XStream library] uses the
-`javax.xml.stream.XMLInputFactory` and
-`javax.xml.stream.XMLOutputFactory`, you can control which
-implementation of this factory should be used.
-
-The Factory is discovered using this algorithm: 
- 1. Use the `javax.xml.stream.XMLInputFactory` ,
-`javax.xml.stream.XMLOutputFactory` system property. 
- 2. Use the `lib/xml.stream.properties` file in the `JRE_HOME`
-directory. 
- 3. Use the Services API, if available, to determine the classname by
-looking in the `META-INF/services/javax.xml.stream.XMLInputFactory`,
-`META-INF/services/javax.xml.stream.XMLOutputFactory` files in jars
-available to the JRE. 
- 4. Use the platform default XMLInputFactory,XMLOutputFactory instance.
-
-[[XStream-HowtosettheXMLencodinginXstreamDataFormat]]
-How to set the XML encoding in Xstream DataFormat?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-From Camel 2.2.0, you can set the encoding of XML in Xstream DataFormat
-by setting the Exchange's property with the key `Exchange.CHARSET_NAME`,
-or setting the encoding property on Xstream from DSL or Spring config.
-
-[source,java]
--------------------------------
-from("activemq:My.Queue").
-  marshal().xstream("UTF-8").
-  to("mqseries:Another.Queue");
--------------------------------
-
-[[XStream-SettingthetypepermissionsofXstreamDataFormat]]
-Setting the type permissions of Xstream DataFormat
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-In Camel, one can always use its own processing step in the route to
-filter and block certain XML documents to be routed to the XStream's
-unmarhall step. From Camel 2.16.1, 2.15.5, you can
-set http://x-stream.github.io/security.html[XStream's type
-permissions] to automatically allow or deny the instantiation of certain
-types.
-
-The default type permissions setting used by Camel denies all types
-except for those from java.lang and java.util packages. This setting can
-be changed by setting System property
-org.apache.camel.xstream.permissions. Its value is a string of
-comma-separated permission terms, each representing a type being allowed
-or denied, depending on whether the term is prefixed with '+' (note '+'
-may be omitted) or with '-', respectively.
-
-Each term may contain a wildcard character '*'. For example, value
-"-*,java.lang.*,java.util.*" indicates denying all types except for
-java.lang.* and java.util.* classes. Setting this value to an empty
-string "" reverts to the default XStream's type permissions handling
-which denies certain blacklisted classes and allow others.
-
-The type permissions setting can be extended at an individual XStream
-DataFormat instance by setting its type permissions property.
-
-[source,java]
--------------------------------------------------------------------
-    <dataFormats>
-        <xstream id="xstream-default" 
-                 permissions="org.apache.camel.samples.xstream.*"/>
-        ...
-
--------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-yammer/src/main/docs/yammer-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/docs/yammer-component.adoc b/components/camel-yammer/src/main/docs/yammer-component.adoc
index 36532c6..77fb409 100644
--- a/components/camel-yammer/src/main/docs/yammer-component.adoc
+++ b/components/camel-yammer/src/main/docs/yammer-component.adoc
@@ -45,13 +45,14 @@ which are mandatory to configure before using.
 
 
 
+
 // component options: START
 The Yammer component supports 4 options which are listed below.
 
 
 
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 | consumerKey | String | The consumer key
@@ -64,6 +65,7 @@ The Yammer component supports 4 options which are listed below.
 
 
 
+
 You can also configure these options directly in the endpoint.
 
 [[Yammer-EndpointOptions]]

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
new file mode 100644
index 0000000..0f61ea6
--- /dev/null
+++ b/components/camel-zipfile/src/main/docs/zipfile-dataformat.adoc
@@ -0,0 +1,159 @@
+[[ZipFileDataFormat-ZipFile]]
+Zip File
+~~~~~~~~
+
+TIP:*Available since Camel 2.11.0*
+
+The Zip File link:data-format.html[Data Format] is a message compression
+and de-compression format. Messages can be marshalled (compressed) to
+Zip files containing a single entry, and Zip files containing a single
+entry can be unmarshalled (decompressed) to the original file contents.
+This data format supports ZIP64, as long as
+https://blogs.oracle.com/xuemingshen/entry/zip64_support_for_4g_zipfile[Java
+7 or later is being used].
+
+Since Camel 2.12.3 there is also a aggregation strategy that can
+aggregate multiple messages into a single Zip file.
+
+[[ZipFileDataFormat-Marshal]]
+Marshal
+^^^^^^^
+
+In this example we marshal a regular text/XML payload to a compressed
+payload using Zip file compression, and send it to an ActiveMQ queue
+called MY_QUEUE.
+
+[source,java]
+-----------------------------------------------------------------------
+from("direct:start").marshal().zipFile().to("activemq:queue:MY_QUEUE");
+-----------------------------------------------------------------------
+
+The name of the Zip entry inside the created Zip file is based on the
+incoming `CamelFileName` message header, which is the standard message
+header used by the link:file2.html[file component]. Additionally, the
+outgoing `CamelFileName` message header is automatically set to the
+value of the incoming `CamelFileName` message header, with the ".zip"
+suffix. So for example, if the following route finds a file named
+"test.txt" in the input directory, the output will be a Zip file named
+"test.txt.zip" containing a single Zip entry named "test.txt":
+
+[source,java]
+-----------------------------------------------------------------------------------------------
+from("file:input/directory?antInclude=*/.txt").marshal().zipFile().to("file:output/directory");
+-----------------------------------------------------------------------------------------------
+
+If there is no incoming `CamelFileName` message header (for example, if
+the link:file2.html[file component] is not the consumer), then the
+message ID is used by default, and since the message ID is normally a
+unique generated ID, you will end up with filenames like
+`ID-MACHINENAME-2443-1211718892437-1-0.zip`. If you want to override
+this behavior, then you can set the value of the `CamelFileName` header
+explicitly in your route:
+
+[source,java]
+---------------------------------------------------------------------------------------------------------------------------
+from("direct:start").setHeader(Exchange.FILE_NAME, constant("report.txt")).marshal().zipFile().to("file:output/directory");
+---------------------------------------------------------------------------------------------------------------------------
+
+This route would result in a Zip file named "report.txt.zip" in the
+output directory, containing a single Zip entry named "report.txt".
+
+[[ZipFileDataFormat-Unmarshal]]
+Unmarshal
+^^^^^^^^^
+
+In this example we unmarshal a Zip file payload from an ActiveMQ queue
+called MY_QUEUE to its original format, and forward it for processing to
+the `UnZippedMessageProcessor`.
+
+[source,java]
+-----------------------------------------------------------------------------------------------
+from("activemq:queue:MY_QUEUE").unmarshal().zipFile().process(new UnZippedMessageProcessor()); 
+-----------------------------------------------------------------------------------------------
+
+If the zip file has more then one entry, the usingIterator option of
+ZipFileDataFormat to be true, and you can use splitter to do the further
+work.
+
+[source,java]
+----------------------------------------------------------------------------------------------------
+  ZipFileDataFormat zipFile = new ZipFileDataFormat();
+  zipFile.setUsingIterator(true);
+  from("file:src/test/resources/org/apache/camel/dataformat/zipfile/?consumer.delay=1000&noop=true")
+    .unmarshal(zipFile)
+    .split(body(Iterator.class))
+        .streaming()
+          .process(new UnZippedMessageProcessor())
+    .end();
+----------------------------------------------------------------------------------------------------
+
+Or you can use the ZipSplitter as an expression for splitter directly
+like this
+
+[source,java]
+----------------------------------------------------------------------------------------------------
+   from("file:src/test/resources/org/apache/camel/dataformat/zipfile?consumer.delay=1000&noop=true")
+     .split(new ZipSplitter())
+        .streaming()
+        .process(new UnZippedMessageProcessor())
+     .end();
+----------------------------------------------------------------------------------------------------
+
+[[ZipFileDataFormat-Aggregate]]
+Aggregate
+^^^^^^^^^
+
+TIP:*Available since Camel 2.12.3*
+
+INFO:Please note that this aggregation strategy requires eager completion
+check to work properly.
+
+In this example we aggregate all text files found in the input directory
+into a single Zip file that is stored in the output directory. 
+
+[source,java]
+-------------------------------------------------
+   from("file:input/directory?antInclude=*/.txt")
+     .aggregate(new ZipAggregationStrategy())
+       .constant(true)
+       .completionFromBatchConsumer()
+       .eagerCheckCompletion()
+   .to("file:output/directory");
+-------------------------------------------------
+
+The outgoing `CamelFileName` message header is created using
+java.io.File.createTempFile, with the ".zip" suffix. If you want to
+override this behavior, then you can set the value of
+the `CamelFileName` header explicitly in your route:
+
+[source,java]
+------------------------------------------------------------
+   from("file:input/directory?antInclude=*/.txt")
+     .aggregate(new ZipAggregationStrategy())
+       .constant(true)
+       .completionFromBatchConsumer()
+       .eagerCheckCompletion()
+     .setHeader(Exchange.FILE_NAME, constant("reports.zip"))
+   .to("file:output/directory");
+------------------------------------------------------------
+
+[[ZipFileDataFormat-Dependencies]]
+Dependencies
+^^^^^^^^^^^^
+
+To use Zip files in your camel routes you need to add a dependency on
+*camel-zipfile* which implements this data format.
+
+If you use Maven you can just add the following to your `pom.xml`,
+substituting the version number for the latest & greatest release (see
+link:download.html[the download page for the latest versions]).
+
+[source,xml]
+----------------------------------------------------------
+<dependency>
+  <groupId>org.apache.camel</groupId>
+  <artifactId>camel-zipfile</artifactId>
+  <version>x.x.x</version>
+  <!-- use the same version as your Camel core version -->
+</dependency>
+----------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/components/camel-zipfile/src/main/docs/zipfile.adoc
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/docs/zipfile.adoc b/components/camel-zipfile/src/main/docs/zipfile.adoc
deleted file mode 100644
index 0f61ea6..0000000
--- a/components/camel-zipfile/src/main/docs/zipfile.adoc
+++ /dev/null
@@ -1,159 +0,0 @@
-[[ZipFileDataFormat-ZipFile]]
-Zip File
-~~~~~~~~
-
-TIP:*Available since Camel 2.11.0*
-
-The Zip File link:data-format.html[Data Format] is a message compression
-and de-compression format. Messages can be marshalled (compressed) to
-Zip files containing a single entry, and Zip files containing a single
-entry can be unmarshalled (decompressed) to the original file contents.
-This data format supports ZIP64, as long as
-https://blogs.oracle.com/xuemingshen/entry/zip64_support_for_4g_zipfile[Java
-7 or later is being used].
-
-Since Camel 2.12.3 there is also a aggregation strategy that can
-aggregate multiple messages into a single Zip file.
-
-[[ZipFileDataFormat-Marshal]]
-Marshal
-^^^^^^^
-
-In this example we marshal a regular text/XML payload to a compressed
-payload using Zip file compression, and send it to an ActiveMQ queue
-called MY_QUEUE.
-
-[source,java]
------------------------------------------------------------------------
-from("direct:start").marshal().zipFile().to("activemq:queue:MY_QUEUE");
------------------------------------------------------------------------
-
-The name of the Zip entry inside the created Zip file is based on the
-incoming `CamelFileName` message header, which is the standard message
-header used by the link:file2.html[file component]. Additionally, the
-outgoing `CamelFileName` message header is automatically set to the
-value of the incoming `CamelFileName` message header, with the ".zip"
-suffix. So for example, if the following route finds a file named
-"test.txt" in the input directory, the output will be a Zip file named
-"test.txt.zip" containing a single Zip entry named "test.txt":
-
-[source,java]
------------------------------------------------------------------------------------------------
-from("file:input/directory?antInclude=*/.txt").marshal().zipFile().to("file:output/directory");
------------------------------------------------------------------------------------------------
-
-If there is no incoming `CamelFileName` message header (for example, if
-the link:file2.html[file component] is not the consumer), then the
-message ID is used by default, and since the message ID is normally a
-unique generated ID, you will end up with filenames like
-`ID-MACHINENAME-2443-1211718892437-1-0.zip`. If you want to override
-this behavior, then you can set the value of the `CamelFileName` header
-explicitly in your route:
-
-[source,java]
----------------------------------------------------------------------------------------------------------------------------
-from("direct:start").setHeader(Exchange.FILE_NAME, constant("report.txt")).marshal().zipFile().to("file:output/directory");
----------------------------------------------------------------------------------------------------------------------------
-
-This route would result in a Zip file named "report.txt.zip" in the
-output directory, containing a single Zip entry named "report.txt".
-
-[[ZipFileDataFormat-Unmarshal]]
-Unmarshal
-^^^^^^^^^
-
-In this example we unmarshal a Zip file payload from an ActiveMQ queue
-called MY_QUEUE to its original format, and forward it for processing to
-the `UnZippedMessageProcessor`.
-
-[source,java]
------------------------------------------------------------------------------------------------
-from("activemq:queue:MY_QUEUE").unmarshal().zipFile().process(new UnZippedMessageProcessor()); 
------------------------------------------------------------------------------------------------
-
-If the zip file has more then one entry, the usingIterator option of
-ZipFileDataFormat to be true, and you can use splitter to do the further
-work.
-
-[source,java]
-----------------------------------------------------------------------------------------------------
-  ZipFileDataFormat zipFile = new ZipFileDataFormat();
-  zipFile.setUsingIterator(true);
-  from("file:src/test/resources/org/apache/camel/dataformat/zipfile/?consumer.delay=1000&noop=true")
-    .unmarshal(zipFile)
-    .split(body(Iterator.class))
-        .streaming()
-          .process(new UnZippedMessageProcessor())
-    .end();
-----------------------------------------------------------------------------------------------------
-
-Or you can use the ZipSplitter as an expression for splitter directly
-like this
-
-[source,java]
-----------------------------------------------------------------------------------------------------
-   from("file:src/test/resources/org/apache/camel/dataformat/zipfile?consumer.delay=1000&noop=true")
-     .split(new ZipSplitter())
-        .streaming()
-        .process(new UnZippedMessageProcessor())
-     .end();
-----------------------------------------------------------------------------------------------------
-
-[[ZipFileDataFormat-Aggregate]]
-Aggregate
-^^^^^^^^^
-
-TIP:*Available since Camel 2.12.3*
-
-INFO:Please note that this aggregation strategy requires eager completion
-check to work properly.
-
-In this example we aggregate all text files found in the input directory
-into a single Zip file that is stored in the output directory. 
-
-[source,java]
--------------------------------------------------
-   from("file:input/directory?antInclude=*/.txt")
-     .aggregate(new ZipAggregationStrategy())
-       .constant(true)
-       .completionFromBatchConsumer()
-       .eagerCheckCompletion()
-   .to("file:output/directory");
--------------------------------------------------
-
-The outgoing `CamelFileName` message header is created using
-java.io.File.createTempFile, with the ".zip" suffix. If you want to
-override this behavior, then you can set the value of
-the `CamelFileName` header explicitly in your route:
-
-[source,java]
-------------------------------------------------------------
-   from("file:input/directory?antInclude=*/.txt")
-     .aggregate(new ZipAggregationStrategy())
-       .constant(true)
-       .completionFromBatchConsumer()
-       .eagerCheckCompletion()
-     .setHeader(Exchange.FILE_NAME, constant("reports.zip"))
-   .to("file:output/directory");
-------------------------------------------------------------
-
-[[ZipFileDataFormat-Dependencies]]
-Dependencies
-^^^^^^^^^^^^
-
-To use Zip files in your camel routes you need to add a dependency on
-*camel-zipfile* which implements this data format.
-
-If you use Maven you can just add the following to your `pom.xml`,
-substituting the version number for the latest & greatest release (see
-link:download.html[the download page for the latest versions]).
-
-[source,xml]
-----------------------------------------------------------
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-zipfile</artifactId>
-  <version>x.x.x</version>
-  <!-- use the same version as your Camel core version -->
-</dependency>
-----------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 6024e52..687f548 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -83,31 +83,31 @@
             * [How do I configure endpoints](how-do-i-configure-endpoints.adoc)
 
 * Core Components
-    * [Bean](bean.adoc)
-    * [Binding](binding.adoc)
-    * [Browse](browse.adoc)
-    * [Class](class.adoc)
-    * [Controlbus](controlbus.adoc)
-    * [Dataformat](dataformat.adoc)
-    * [Dataset](dataset.adoc)
-    * [Direct](direct.adoc)
-    * [Direct-vm](direct-vm.adoc)
-    * [File](file.adoc)
-    * [Language](language.adoc)
-    * [Log](log.adoc)
-    * [Mock](mock.adoc)
-    * [Properties](properties.adoc)
-    * [Ref](ref.adoc)
-    * [Rest](rest.adoc)
-    * [Rest API](rest-api.adoc)
-    * [Scheduler](scheduler.adoc)
-    * [Seda](seda.adoc)
-    * [Stub](stub.adoc)
-    * [Test](test.adoc)
-    * [Timer](timer.adoc)
-    * [Validator](validator.adoc)
-    * [VM](vm.adoc)
-    * [Xslt](xslt.adoc)
+    * [Bean](bean-component.adoc)
+    * [Binding](binding-component.adoc)
+    * [Browse](browse-component.adoc)
+    * [Class](class-component.adoc)
+    * [Controlbus](controlbus-component.adoc)
+    * [Dataformat](dataformat-component.adoc)
+    * [Dataset](dataset-component.adoc)
+    * [Direct](direct-component.adoc)
+    * [Direct-vm](direct-vm-component.adoc)
+    * [File](file-component.adoc)
+    * [Language](language-component.adoc)
+    * [Log](log-component.adoc)
+    * [Mock](mock-component.adoc)
+    * [Properties](properties-component.adoc)
+    * [Ref](ref-component.adoc)
+    * [Rest](rest-component.adoc)
+    * [Rest API](rest-api-component.adoc)
+    * [Scheduler](scheduler-component.adoc)
+    * [Seda](seda-component.adoc)
+    * [Stub](stub-component.adoc)
+    * [Test](test-component.adoc)
+    * [Timer](timer-component.adoc)
+    * [Validator](validator-component.adoc)
+    * [VM](vm-component.adoc)
+    * [Xslt](xslt-component.adoc)
 
 * Components
     * [Async Http Client (AHC)](ahc-component.adoc)
@@ -336,24 +336,24 @@
     * [Scripting languages](scripting-languages.adoc)
 
 * Data Formats
-    * [BeanIO](beanio.adoc)
-    * [Flatpack](flatpack-dataformat.adoc)
-    * [Ical](ical.adoc)
-    * [Jackson XML](jackson-xml.adoc)
-    * [Jaxb](jaxb.adoc)
-    * [Jibx](jibx.adoc)
-    * [Johnzon](johnzon.adoc)
-    * [Lzf](lzf.adoc)
-    * [Syslog](syslog.adoc)
-    * [SOAP](soap.adoc)
-    * [Tagsoup](tagsoup.adoc)
-    * [Univocity Parsers](univocity-parsers.adoc)
-    * [XML Beans](xmlbeans.adoc)
-    * [XML JSON](xmljson.adoc)
-    * [XML Rpc](xmlrpc.adoc)
-    * [XStream](xstream.adoc)
-    * [YAML](yaml.adoc)
-    * [Zipfile](zipfile.adoc)
+    * [BeanIO](beanio-dataformat.adoc)
+    * [Flatpack](flatpack-dataformat-dataformat.adoc)
+    * [Ical](ical-dataformat.adoc)
+    * [Jackson XML](jackson-xml-dataformat.adoc)
+    * [Jaxb](jaxb-dataformat.adoc)
+    * [Jibx](jibx-dataformat.adoc)
+    * [Johnzon](johnzon-dataformat.adoc)
+    * [Lzf](lzf-dataformat.adoc)
+    * [Syslog](syslog-dataformat.adoc)
+    * [SOAP](soap-dataformat.adoc)
+    * [Tagsoup](tagsoup-dataformat.adoc)
+    * [Univocity Parsers](univocity-parsers-dataformat.adoc)
+    * [XML Beans](xmlbeans-dataformat.adoc)
+    * [XML JSON](xmljson-dataformat.adoc)
+    * [XML Rpc](xmlrpc-dataformat.adoc)
+    * [XStream](xstream-dataformat.adoc)
+    * [YAML](yaml-dataformat.adoc)
+    * [Zipfile](zipfile-dataformat.adoc)
 
 * Example
     * [BAM Example](bam-example.adoc)

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/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 40247cd..f4f85fb 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
@@ -140,6 +140,7 @@ public class ReadmeComponentMojo extends AbstractMojo {
                 String json = loadDataFormatJson(jsonFiles, dataFormatName);
                 if (json != null) {
                     File file = new File(docDir, dataFormatName + "-dataformat.adoc");
+
                     DataFormatModel model = generateDataFormatModel(dataFormatName, json);
 
                     boolean exists = file.exists();

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
index 98b16c9..ece05bb 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/component-options.mvel
@@ -6,7 +6,7 @@ The @{title} component supports @{componentOptions.size()} options which are
lis
 
 @if{!componentOptions.isEmpty()}
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,7",options="header"]
 |=======================================================================
 | Name | Java Type | Description
 @foreach{row : componentOptions}| @{row.name} | @{row.shortJavaType} | @{row.description}

http://git-wip-us.apache.org/repos/asf/camel/blob/96f3710b/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
b/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
index 8fe798e..c729393 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/dataformat-options.mvel
@@ -6,10 +6,10 @@ The @{title} dataformat supports @{dataFormatOptions.size()} options which
are l
 
 @if{!dataFormatOptions.isEmpty()}
 {% raw %}
-[width="100%",cols="2s,1m,8",options="header"]
+[width="100%",cols="2s,1m,1m,6",options="header"]
 |=======================================================================
-| Name | Java Type | Description
-@foreach{row : dataFormatOptions}| @{row.name} | @{row.shortJavaType} | @{row.description}
+| Name | Default | Java Type | Description
+@foreach{row : dataFormatOptions}| @{row.name} | @{row.defaultValue} | @{row.shortJavaType}
| @{row.description}
 @end{}|=======================================================================
 {% endraw %}
 @end{}
\ No newline at end of file


Mime
View raw message