http://git-wip-us.apache.org/repos/asf/camel/blob/1fd504a1/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 5661768..cafa080 100644 --- a/components/camel-yammer/src/main/docs/yammer-component.adoc +++ b/components/camel-yammer/src/main/docs/yammer-component.adoc @@ -52,13 +52,13 @@ The Yammer component supports 4 options which are listed below. {% raw %} -[width="100%",cols="2,1m,7",options="header"] +[width="100%",cols="2,1,1m,1m,5",options="header"] |======================================================================= -| Name | Java Type | Description -| consumerKey | String | The consumer key -| consumerSecret | String | The consumer secret -| accessToken | String | The access token -| config | YammerConfiguration | To use a shared yammer configuration +| Name | Group | Default | Java Type | Description +| consumerKey | | | String | The consumer key +| consumerSecret | | | String | The consumer secret +| accessToken | | | String | The access token +| config | | | YammerConfiguration | To use a shared yammer configuration |======================================================================= {% endraw %} // component options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/1fd504a1/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc index 5f8d5cf..1293990 100644 --- a/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc +++ b/components/camel-zookeeper/src/main/docs/zookeeper-component.adoc @@ -60,10 +60,10 @@ The ZooKeeper component supports 1 options which are listed below. {% raw %} -[width="100%",cols="2,1m,7",options="header"] +[width="100%",cols="2,1,1m,1m,5",options="header"] |======================================================================= -| Name | Java Type | Description -| configuration | ZooKeeperConfiguration | To use a shared ZooKeeperConfiguration +| Name | Group | Default | Java Type | Description +| configuration | | | ZooKeeperConfiguration | To use a shared ZooKeeperConfiguration |======================================================================= {% endraw %} // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/1fd504a1/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index 5c86856..972b0f3 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -204,9 +204,6 @@ Components | link:camel-google-mail/src/main/docs/google-mail-component.adoc[Google Mail] (camel-google-mail) + `google-mail:apiName/methodName` | The google-mail component provides access to Google Mail. -| link:camel-google-pubsub/src/main/docs/google-pubsub-component.adoc[Google Pubsub] (camel-google-pubsub) + -`google-pubsub:projectId:destinationName` | Messaging client for Google Cloud Platform PubSub Service: https://cloud.google.com/pubsub/ - | link:camel-gora/src/main/docs/gora-component.adoc[Gora] (camel-gora) + `gora:name` | The gora component allows you to work with NoSQL databases using the Apache Gora framework. @@ -342,9 +339,6 @@ Components | link:camel-mongodb/src/main/docs/mongodb-component.adoc[MongoDB] (camel-mongodb) + `mongodb:connectionBean` | Component for working with documents stored in MongoDB database. -| link:camel-mongodb3/src/main/docs/mongodb3-component.adoc[MongoDB] (camel-mongodb3) + -`mongodb3:connectionBean` | Component for working with documents stored in MongoDB database. - | link:camel-mongodb-gridfs/src/main/docs/gridfs-component.adoc[MongoDBGridFS] (camel-mongodb-gridfs) + `gridfs:connectionBean` | Component for working with MongoDB GridFS. @@ -384,24 +378,6 @@ Components | link:camel-openshift/src/main/docs/openshift-component.adoc[OpenShift] (camel-openshift) + `openshift:clientId` | *deprecated* To manage your Openshift 2.x applications. -| link:camel-openstack/src/main/docs/openstack-cinder-component.adoc[OpenStack Cinder] (camel-openstack) + -`openstack-cinder:host` | The openstack-cinder component allows messages to be sent to an OpenStack block storage services. - -| link:camel-openstack/src/main/docs/openstack-glance-component.adoc[OpenStack Glance] (camel-openstack) + -`openstack-glance:host` | The openstack-glance component allows messages to be sent to an OpenStack image services. - -| link:camel-openstack/src/main/docs/openstack-keystone-component.adoc[OpenStack Keystone] (camel-openstack) + -`openstack-keystone:host` | The openstack-keystone component allows messages to be sent to an OpenStack identity services. - -| link:camel-openstack/src/main/docs/openstack-neutron-component.adoc[OpenStack Neutron] (camel-openstack) + -`openstack-neutron:host` | The openstack-neutron component allows messages to be sent to an OpenStack network services. - -| link:camel-openstack/src/main/docs/openstack-nova-component.adoc[OpenStack Nova] (camel-openstack) + -`openstack-nova:host` | The openstack-nova component allows messages to be sent to an OpenStack compute services. - -| link:camel-openstack/src/main/docs/openstack-swift-component.adoc[OpenStack Swift] (camel-openstack) + -`openstack-swift:host` | The openstack-swift component allows messages to be sent to an OpenStack object storage services. - | link:camel-optaplanner/src/main/docs/optaplanner-component.adoc[OptaPlanner] (camel-optaplanner) + `optaplanner:configFile` | Solves the planning problem contained in a message with OptaPlanner. http://git-wip-us.apache.org/repos/asf/camel/blob/1fd504a1/docs/user-manual/en/SUMMARY.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index e6c39fb..bdcce6d 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -190,7 +190,6 @@ * [Google Calendar](google-calendar-component.adoc) * [Google Drive](google-drive-component.adoc) * [Google Mail](google-mail-component.adoc) - * [Google Pubsub](google-pubsub-component.adoc) * [Gora](gora-component.adoc) * [Grape](grape-component.adoc) * [Guava EventBus](guava-eventbus-component.adoc) @@ -236,7 +235,6 @@ * [Mina2](mina2-component.adoc) * [MLLP](mllp-component.adoc) * [MongoDB](mongodb-component.adoc) - * [MongoDB](mongodb3-component.adoc) * [MongoDBGridFS](gridfs-component.adoc) * [MQTT](mqtt-component.adoc) * [MSV](msv-component.adoc) @@ -250,12 +248,6 @@ * [Netty4](netty4-component.adoc) * [Netty4 HTTP](netty4-http-component.adoc) * [OpenShift](openshift-component.adoc) - * [OpenStack Cinder](openstack-cinder-component.adoc) - * [OpenStack Glance](openstack-glance-component.adoc) - * [OpenStack Keystone](openstack-keystone-component.adoc) - * [OpenStack Neutron](openstack-neutron-component.adoc) - * [OpenStack Nova](openstack-nova-component.adoc) - * [OpenStack Swift](openstack-swift-component.adoc) * [OptaPlanner](optaplanner-component.adoc) * [OSGi EventAdmin](eventadmin-component.adoc) * [OSGi PAX Logging](paxlogging-component.adoc) http://git-wip-us.apache.org/repos/asf/camel/blob/1fd504a1/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 d355541..434e6e6 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 @@ -496,10 +496,18 @@ public class ReadmeComponentMojo extends AbstractMojo { ComponentOptionModel option = new ComponentOptionModel(); option.setName(getSafeValue("name", row)); option.setKind(getSafeValue("kind", row)); + option.setGroup(getSafeValue("group", row)); + option.setRequired(getSafeValue("required", row)); option.setType(getSafeValue("type", row)); option.setJavaType(getSafeValue("javaType", row)); option.setDeprecated(getSafeValue("deprecated", row)); + option.setDefaultValue(getSafeValue("defaultValue", row)); option.setDescription(getSafeValue("description", row)); + // lets put required in the description + if ("true".equals(option.getRequired())) { + String desc = "*Required* " + option.getDescription(); + option.setDescription(desc); + } component.addComponentOption(option); } http://git-wip-us.apache.org/repos/asf/camel/blob/1fd504a1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java index 435685f..c94e0dd 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/model/ComponentOptionModel.java @@ -20,6 +20,8 @@ public class ComponentOptionModel { private String name; private String kind; + private String group; + private String required; private String type; private String javaType; private String deprecated; @@ -43,6 +45,22 @@ public class ComponentOptionModel { this.kind = kind; } + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getRequired() { + return required; + } + + public void setRequired(String required) { + this.required = required; + } + public String getType() { return type; } http://git-wip-us.apache.org/repos/asf/camel/blob/1fd504a1/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 e90937b..020b125 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,10 +6,10 @@ The @{title} component supports @{componentOptions.size()} options which are lis @if{!componentOptions.isEmpty()} {% raw %} -[width="100%",cols="2,1m,7",options="header"] +[width="100%",cols="2,1,1m,1m,5",options="header"] |======================================================================= -| Name | Java Type | Description -@foreach{row : componentOptions}| @{row.name} | @{row.shortJavaType} | @{row.description} +| Name | Group | Default | Java Type | Description +@foreach{row : componentOptions}| @{row.name} | @{row.group} | @{row.defaultValue} | @{row.shortJavaType} | @{row.description} @end{}|======================================================================= {% endraw %} @end{} \ No newline at end of file
