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 2017/03/27 15:21:02 UTC

camel git commit: CAMEL-11062: Polished

Repository: camel
Updated Branches:
  refs/heads/master cbbe9668b -> 60799b9c9


CAMEL-11062: Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/60799b9c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/60799b9c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/60799b9c

Branch: refs/heads/master
Commit: 60799b9c9ba68c8f4b95fc4a86557e3234395d6c
Parents: cbbe966
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 27 17:20:43 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 27 17:20:43 2017 +0200

----------------------------------------------------------------------
 components/camel-digitalocean/pom.xml           | 37 +++++++------
 .../src/main/docs/digitalocean-component.adoc   | 56 +++++++-------------
 .../digitalocean/DigitalOceanConfiguration.java | 16 +++---
 .../digitalocean/DigitalOceanEndpoint.java      |  6 +--
 .../digitalocean/DigitalOceanClientMock.java    |  2 +-
 .../digitalocean/DigitalOceanComponentTest.java |  1 -
 .../DigitalOceanComponentIntegrationTest.java   |  2 -
 .../integration/DigitalOceanTestSupport.java    |  1 -
 .../src/test/resources/log4j2.properties        | 18 ++++---
 components/readme.adoc                          |  5 +-
 docs/user-manual/en/SUMMARY.md                  |  1 +
 11 files changed, 65 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/pom.xml b/components/camel-digitalocean/pom.xml
index efd23e6..34e9637 100644
--- a/components/camel-digitalocean/pom.xml
+++ b/components/camel-digitalocean/pom.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -29,14 +31,16 @@ limitations under the License.
   <name>Camel :: DigitalOcean</name>
   <description>Camel DigitalOcean support</description>
 
-
   <properties>
+    <!-- use by camel-catalog -->
+    <firstVersion>2.19.0</firstVersion>
+
     <camel.osgi.export.pkg>org.apache.camel.component.digitalocean.*</camel.osgi.export.pkg>
     <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=digitalocean</camel.osgi.export.service>
   </properties>
 
-
   <dependencies>
+
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
@@ -66,8 +70,6 @@ limitations under the License.
       <scope>test</scope>
     </dependency>
 
-
-
     <!-- testing -->
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -77,7 +79,8 @@ limitations under the License.
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.9.5</version>
+      <version>${mockito-version}</version>
     </dependency>
   </dependencies>
+
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc b/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc
index da40f19..411c441 100644
--- a/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc
+++ b/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc
@@ -4,12 +4,11 @@
 
 The **DigitalOcean** component allows you to manage Droplets and resources within the DigitalOcean cloud with **Camel** by encapsulating [digitalocean-api-java](https://www.digitalocean.com/community/projects/api-client-in-java). All of the functionality that you are familiar with in the DigitalOcean control panel is also available through this Camel component.
 
-
-## Prerequisites
+### Prerequisites
 
 You must have a valid DigitalOcean account and a valid OAuth token. You can generate an OAuth token by visiting the [Apps & API](https://cloud.digitalocean.com/settings/applications) section of the DigitalOcean control panel for your account.
 
-## URI format
+### URI format
 
 The **DigitalOcean Component** uses the following URI format:
 
@@ -26,24 +25,6 @@ digitalocean://droplets?operation=list&oAuthToken=XXXXXX&page=1&perPage=10
 
 The DigitalOcean component only supports producer endpoints so you cannot use this component at the beginning of a route to listen to messages in a channel.
 
-## URI Endpoints
-
-There is one endpoint for each DigitalOcean resources (defined in `DigitalOceanResources` enumeration):
-
-| Endpoint | Description |
-| ------ | ----------- |
-| `account` | Your account on DigitalOcean. |
-| `actions` | Actions are records of events that have occurred on the resources in your account.  |
-| `blockStorages` | Block Storage volumes provide expanded storage capacity for your Droplets and can be moved between Droplets within a specific region. |
-| `droplets` | A Droplet is a DigitalOcean virtual machine. |
-| `images` | An image may refer to a snapshot that has been taken of a Droplet instance. It may also mean an image representing an automatic backup of a Droplet. |
-| `snapshots` | Snapshots are saved instances of a Droplet or a volume. |
-| `keys` | DigitalOcean allows you to add SSH public keys to the interface so that you can embed your public key into a Droplet at the time of creation. |
-| `regions` | A region in DigitalOcean represents a datacenter where Droplets can be deployed and images can be transferred. |
-| `sizes` | The sizes objects represent different packages of hardware resources that can be used for Droplets.  |
-| `floatingIPs` | Floating IP objects represent a publicly-accessible static IP addresses that can be mapped to one of your Droplets. |
-| `tags` | A Tag is a label that can be applied to a resource (currently only Droplets) in order to better organize or facilitate the lookups and actions on it. |
-
 
 ### Options
 
@@ -55,7 +36,7 @@ The DigitalOcean component has no options.
 // endpoint options: START
 The DigitalOcean endpoint is configured using URI syntax:
 
-    digitalocean:label
+    digitalocean:operation
 
 with the following path and query parameters:
 
@@ -72,10 +53,10 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |=======================================================================
 | Name | Description | Default | Type
-| **digitalOceanClient** (producer) | To use a existing configured DigitalOceanClient as client |  | DigitalOceanClient
 | **page** (producer) | Use for pagination. Force the page number. | 1 | Integer
 | **perPage** (producer) | Use for pagination. Set the number of item per request. The maximum number of results per page is 200. | 25 | Integer
 | **resource** (producer) | *Required* The DigitalOcean resource type on which perform the operation. |  | DigitalOceanResources
+| **digitalOceanClient** (advanced) | To use a existing configured DigitalOceanClient as client |  | DigitalOceanClient
 | **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | **httpProxyHost** (proxy) | Set a proxy host if needed |  | String
 | **httpProxyPassword** (proxy) | Set a proxy password if needed |  | String
@@ -93,25 +74,24 @@ All **operation** values are defined in `DigitalOceanOperations` enumeration.
 All **header** names used by the component are defined in `DigitalOceanHeaders` enumeration.
 
 
-## Message body result
-All message bodies returned are using objects provided by the **digitalocean-api-java** library.
+### Message body result
 
+All message bodies returned are using objects provided by the **digitalocean-api-java** library.
 
-## API Rate Limits
 
+### API Rate Limits
 
 DigitalOcean REST API encapsulated by camel-digitalocean component is subjected to API Rate Limiting. You can find the per method limits in the [API Rate Limits documentation](https://developers.digitalocean.com/documentation/v2/#rate-limit).
 
 
-## Account endpoint
+### Account endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
 | `get` | get account info |  | `com.myjeeva.digitalocean.pojo.Account`  |
 
 
-
-## BlockStorages endpoint
+### BlockStorages endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
@@ -129,7 +109,7 @@ DigitalOcean REST API encapsulated by camel-digitalocean component is subjected
 | `resize` | resize a Block Storage volume | `CamelDigitalOceanVolumeSizeGigabytes`  _Integer_<br>`CamelDigitalOceanRegion` _String_| `com.myjeeva.digitalocean.pojo.Action`  |
 | `listActions` | retrieve all actions that have been executed on a volume | `CamelDigitalOceanId`  _Integer_| `List<com.myjeeva.digitalocean.pojo.Action>`  |
 
-## Droplets endpoint
+### Droplets endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
@@ -163,7 +143,7 @@ DigitalOcean REST API encapsulated by camel-digitalocean component is subjected
 | `listNeighbors` |  retrieve a list of droplets that are running on the same physical server | `CamelDigitalOceanId` _Integer_ | `List<com.myjeeva.digitalocean.pojo.Droplet>`  |
 | `listAllNeighbors` |  retrieve a list of any droplets that are running on the same physical hardware | | `List<com.myjeeva.digitalocean.pojo.Droplet>`  |
 
-## Images endpoint
+### Images endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
@@ -177,7 +157,7 @@ DigitalOcean REST API encapsulated by camel-digitalocean component is subjected
 | `transfer` | transfer an image to another region| `CamelDigitalOceanId` _Integer_ <br>`CamelDigitalOceanRegion` _String_| `com.myjeeva.digitalocean.pojo.Action`  |
 | `convert` | convert an image, for example, a backup to a snapshot| `CamelDigitalOceanId` _Integer_ | `com.myjeeva.digitalocean.pojo.Action`  |
 
-## Snapshots endpoint
+### Snapshots endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
@@ -186,7 +166,7 @@ DigitalOcean REST API encapsulated by camel-digitalocean component is subjected
 | `delete` | delete an snapshot| `CamelDigitalOceanId` _Integer_ | `com.myjeeva.digitalocean.pojo.Delete`  |
 
 
-## Keys endpoint
+### Keys endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
@@ -198,20 +178,20 @@ DigitalOcean REST API encapsulated by camel-digitalocean component is subjected
 | `delete` | delete a key by id| `CamelDigitalOceanId` _Integer_ | `com.myjeeva.digitalocean.pojo.Delete`  |
 | `delete` | delete a key by fingerprint| `CamelDigitalOceanKeyFingerprint` _String_ | `com.myjeeva.digitalocean.pojo.Delete`  |
 
-## Regions endpoint
+### Regions endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
 | `list` |  list all of the regions that are available | | `List<com.myjeeva.digitalocean.pojo.Region>`  |
 
 
-## Sizes endpoint
+### Sizes endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
 | `list` |  list all of the sizes that are available | | `List<com.myjeeva.digitalocean.pojo.Size>`  |
 
-## Floating IPs endpoint
+### Floating IPs endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
@@ -224,7 +204,7 @@ DigitalOcean REST API encapsulated by camel-digitalocean component is subjected
 | `unassign` | unassign a Floating IP | `CamelDigitalOceanFloatingIPAddress` _String_ | `com.myjeeva.digitalocean.pojo.Action`  |
 | `listActions` |  retrieve all actions that have been executed on a Floating IP | `CamelDigitalOceanFloatingIPAddress` _String_ | `List<com.myjeeva.digitalocean.pojo.Action>`  |
 
-## Tags endpoint
+### Tags endpoint
 
 | operation | Description | Headers | Result |
 | ------ | ---- | ------- | ----------- |
@@ -235,7 +215,7 @@ DigitalOcean REST API encapsulated by camel-digitalocean component is subjected
 | `update` |  update a tag | `CamelDigitalOceanName` _String_ <br>`CamelDigitalOceanNewName` _String_| `com.myjeeva.digitalocean.pojo.Tag`  |
 
 
-## Examples
+### Examples
 
 Get your account info
 

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanConfiguration.java b/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanConfiguration.java
index 848b886..c0923b1 100644
--- a/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanConfiguration.java
+++ b/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanConfiguration.java
@@ -28,18 +28,17 @@ import org.apache.camel.spi.UriPath;
 @UriParams
 public class DigitalOceanConfiguration {
 
-
-    @UriParam(enums = "account,actions,blockStorages,droplets,mages,snapshots,keys,regions,sizes,floatingIPs,tags")
-    @Metadata(required = "true")
-    private DigitalOceanResources resource;
-
     @UriPath(enums = "create,update,delete,list,ownList,get,listBackups,listActions,listNeighbors,listSnapshots,listKernels,listAllNeighbors,"
         + "enableBackups,disableBackups,reboot,powerCycle,shutdown,powerOn,powerOff,restore,resetPassword,"
         + "resize,rebuild,rename,changeKernel,enableIpv6,enablePrivateNetworking,takeSnapshot,transfer,convert,"
         + "attach,detach,assign,unassign,tag,untag")
     private DigitalOceanOperations operation;
 
-    @UriParam
+    @UriParam(enums = "account,actions,blockStorages,droplets,mages,snapshots,keys,regions,sizes,floatingIPs,tags")
+    @Metadata(required = "true")
+    private DigitalOceanResources resource;
+
+    @UriParam(label = "advanced")
     private DigitalOceanClient digitalOceanClient;
 
     @UriParam(label = "security", secret = true)
@@ -51,12 +50,11 @@ public class DigitalOceanConfiguration {
     @UriParam(defaultValue = "25")
     private Integer perPage = 25;
 
-
     @UriParam(label = "proxy")
     private String httpProxyHost;
-    @UriParam(label = "proxy")
+    @UriParam(label = "proxy", secret = true)
     private String httpProxyUser;
-    @UriParam(label = "proxy")
+    @UriParam(label = "proxy", secret = true)
     private String httpProxyPassword;
     @UriParam(label = "proxy")
     private Integer httpProxyPort;

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java b/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java
index 4cf5b15..4c5f87f 100644
--- a/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java
+++ b/components/camel-digitalocean/src/main/java/org/apache/camel/component/digitalocean/DigitalOceanEndpoint.java
@@ -44,9 +44,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Represents the DigitalOcean endpoint.
+ * The DigitalOcean component allows you to manage Droplets and resources within the DigitalOcean cloud.
  */
-@UriEndpoint(scheme = "digitalocean", title = "DigitalOcean", syntax = "digitalocean:label", producerOnly = true, label = "cloud,management")
+@UriEndpoint(scheme = "digitalocean", title = "DigitalOcean", syntax = "digitalocean:operation", producerOnly = true, label = "cloud,management")
 public class DigitalOceanEndpoint extends DefaultEndpoint {
 
     private static final transient Logger LOG = LoggerFactory.getLogger(DigitalOceanEndpoint.class);
@@ -128,8 +128,6 @@ public class DigitalOceanEndpoint extends DefaultEndpoint {
         } else {
             digitalOceanClient = new DigitalOceanClient(configuration.getOAuthToken());
         }
-
-
     }
 
     public DigitalOceanConfiguration getConfiguration() {

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanClientMock.java
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanClientMock.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanClientMock.java
index 769c628..24971f0 100644
--- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanClientMock.java
+++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanClientMock.java
@@ -23,7 +23,6 @@ import com.myjeeva.digitalocean.pojo.Account;
 
 public class DigitalOceanClientMock extends DigitalOceanClient {
 
-
     public DigitalOceanClientMock() {
         super("token");
     }
@@ -35,4 +34,5 @@ public class DigitalOceanClientMock extends DigitalOceanClient {
 
         return account;
     }
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java
index ce5a37f..34243cb 100644
--- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java
+++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/DigitalOceanComponentTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 
 public class DigitalOceanComponentTest extends CamelTestSupport {
 
-
     @EndpointInject(uri = "mock:result")
     protected MockEndpoint mockResultEndpoint;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java
index 8fed264..9269f8e 100644
--- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java
+++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanComponentIntegrationTest.java
@@ -36,7 +36,6 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Ignore;
 import org.junit.Test;
 
-
 @Ignore("Must be manually tested. Provide your own oAuthToken")
 public class DigitalOceanComponentIntegrationTest extends DigitalOceanTestSupport {
 
@@ -340,5 +339,4 @@ public class DigitalOceanComponentIntegrationTest extends DigitalOceanTestSuppor
         assertNotEquals(regions.size(), 1);
     }
 
-
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java
index 914437b..bf7d637 100644
--- a/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java
+++ b/components/camel-digitalocean/src/test/java/org/apache/camel/component/digitalocean/integration/DigitalOceanTestSupport.java
@@ -23,7 +23,6 @@ import java.util.Properties;
 
 import org.apache.camel.test.junit4.CamelTestSupport;
 
-
 public class DigitalOceanTestSupport extends CamelTestSupport {
 
     protected final Properties properties;

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/camel-digitalocean/src/test/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/components/camel-digitalocean/src/test/resources/log4j2.properties b/components/camel-digitalocean/src/test/resources/log4j2.properties
index 8daffa6..bc5749f 100644
--- a/components/camel-digitalocean/src/test/resources/log4j2.properties
+++ b/components/camel-digitalocean/src/test/resources/log4j2.properties
@@ -14,9 +14,15 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-appender.out.type=Console
-appender.out.name=out
-appender.out.layout.type=PatternLayout
-appender.out.layout.pattern=[%30.30t] %-30.30c{1} %-5p %m%n
-rootLogger.level=DEBUG
-rootLogger.appenderRef.out.ref=out
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-digitalocean-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+rootLogger.level = INFO
+rootLogger.appenderRef.file.ref = file

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index f65dbd5..dc211b3 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^^^^^^^^^
 
 // components: START
-Number of Components: 225 in 179 JAR artifacts (14 deprecated)
+Number of Components: 226 in 180 JAR artifacts (14 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |=======================================================================
@@ -161,6 +161,9 @@ Number of Components: 225 in 179 JAR artifacts (14 deprecated)
 | link:../camel-core/src/main/docs/dataset-component.adoc[Dataset] (camel-core) +
 `dataset:name` | 1.3 | The dataset component provides a mechanism to easily perform load & soak testing of your system.
 
+| link:camel-digitalocean/src/main/docs/digitalocean-component.adoc[DigitalOcean] (camel-digitalocean) +
+`digitalocean:label` |  | The DigitalOcean component allows you to manage Droplets and resources within the DigitalOcean cloud.
+
 | link:../camel-core/src/main/docs/direct-component.adoc[Direct] (camel-core) +
 `direct:name` | 1.0 | The direct component provides direct synchronous call to another endpoint from the same CamelContext.
 

http://git-wip-us.apache.org/repos/asf/camel/blob/60799b9c/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index c4b602f..4be5eac 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -168,6 +168,7 @@
 	* [Crypto (JCE)](crypto-component.adoc)
 	* [CXF](cxf-component.adoc)
 	* [CXF-RS](cxfrs-component.adoc)
+	* [DigitalOcean](digitalocean-component.adoc)
 	* [Disruptor](disruptor-component.adoc)
 	* [DNS](dns-component.adoc)
 	* [Docker](docker-component.adoc)