You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/12/09 03:11:43 UTC

[39/50] [abbrv] git commit: CAMEL-7041: Upgraded to jclouds 1.6.3

CAMEL-7041: Upgraded to jclouds 1.6.3

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

Branch: refs/heads/camel-gora
Commit: d43c34bcac8057e893582fe338507cb6770bcfd0
Parents: 298889a
Author: Babak Vahdat <bv...@apache.org>
Authored: Thu Dec 5 11:18:36 2013 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Thu Dec 5 11:18:36 2013 +0100

----------------------------------------------------------------------
 .../apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java   | 2 +-
 .../org/apache/camel/component/jclouds/JcloudsComputeProducer.java | 1 -
 parent/pom.xml                                                     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d43c34bc/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
index b16a608..b702b19 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreConsumer.java
@@ -81,7 +81,7 @@ public class JcloudsBlobStoreConsumer extends ScheduledBatchPollingConsumer {
                         Exchange exchange = endpoint.createExchange();
                         CachedOutputStream cos = new CachedOutputStream(exchange);
                         IOHelper.copy(body, cos);
-                        exchange.getIn().setBody(cos.getStreamCache());
+                        exchange.getIn().setBody(cos.newStreamCache());
                         exchange.setProperty(JcloudsConstants.BLOB_NAME, blobName);
                         queue.add(exchange);
                     }

http://git-wip-us.apache.org/repos/asf/camel/blob/d43c34bc/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
index 139e29f..3d630d4 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
@@ -107,7 +107,6 @@ public class JcloudsComputeProducer extends JcloudsProducer {
     /**
      * Runs a script on the target node.
      */
-    @SuppressWarnings("deprecation")
     protected void runScriptOnNode(Exchange exchange) throws CamelException {
         String script = exchange.getIn().getBody(String.class);
         String nodeId = getNodeId(exchange);

http://git-wip-us.apache.org/repos/asf/camel/blob/d43c34bc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 62cc115..02c7d60 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -210,7 +210,7 @@
     <jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
     <jboss-logging-version>3.1.3.GA</jboss-logging-version>
     <jboss-marshalling-version>1.3.18.GA</jboss-marshalling-version>
-    <jclouds-version>1.6.2-incubating</jclouds-version>
+    <jclouds-version>1.6.3</jclouds-version>
     <!-- jclouds must use this guava version -->
     <jclouds-google-guava-version>14.0.1</jclouds-google-guava-version>
     <jcr-version>2.0</jcr-version>