You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by io...@apache.org on 2013/07/08 13:02:59 UTC
git commit: [CAMEL-6517] Upgrade to jclouds 1.6.1 incubating.
Updated Branches:
refs/heads/master d1c6062c1 -> 42125feef
[CAMEL-6517] Upgrade to jclouds 1.6.1 incubating.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42125fee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42125fee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42125fee
Branch: refs/heads/master
Commit: 42125feef2e6a7134e36ca2d97301f1c93a27098
Parents: d1c6062
Author: Ioannis Canellos <io...@apache.org>
Authored: Mon Jul 8 14:02:04 2013 +0300
Committer: Ioannis Canellos <io...@apache.org>
Committed: Mon Jul 8 14:02:04 2013 +0300
----------------------------------------------------------------------
components/camel-jclouds/pom.xml | 4 ++--
.../jclouds/JcloudsComputeProducer.java | 19 +++++++++----------
parent/pom.xml | 4 ++--
.../features/src/main/resources/features.xml | 2 +-
4 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/42125fee/components/camel-jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 2727987..4ad55aa 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -45,13 +45,13 @@
<!-- jclouds -->
<dependency>
- <groupId>org.jclouds</groupId>
+ <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
<version>${jclouds-version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds</groupId>
+ <groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-compute</artifactId>
<version>${jclouds-version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/42125fee/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 5afeeb8..139e29f 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
@@ -28,7 +28,6 @@ import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.Image;
import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.NodeState;
import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.domain.internal.NodeMetadataImpl;
import org.jclouds.compute.options.RunScriptOptions;
@@ -132,7 +131,7 @@ public class JcloudsComputeProducer extends JcloudsProducer {
}
exchange.setProperty(JcloudsConstants.RUN_SCRIPT_ERROR, execResponse.getError());
- exchange.setProperty(JcloudsConstants.RUN_SCRIPT_EXIT_CODE, execResponse.getExitCode());
+ exchange.setProperty(JcloudsConstants.RUN_SCRIPT_EXIT_CODE, execResponse.getExitStatus());
exchange.getOut().setBody(execResponse.getOutput());
}
@@ -205,7 +204,7 @@ public class JcloudsComputeProducer extends JcloudsProducer {
final String nodeId = getNodeId(exchange);
final String imageId = getImageId(exchange);
final String group = getGroup(exchange);
- final NodeState queryState = getNodeState(exchange);
+ final NodeMetadata.Status queryState = getNodeState(exchange);
Predicate<NodeMetadata> predicate = new Predicate<NodeMetadata>() {
public boolean apply(NodeMetadata metadata) {
@@ -215,7 +214,7 @@ public class JcloudsComputeProducer extends JcloudsProducer {
if (imageId != null && !imageId.equals(metadata.getImageId())) {
return false;
}
- if (queryState != null && !queryState.equals(metadata.getState())) {
+ if (queryState != null && !queryState.equals(metadata.getStatus())) {
return false;
}
if (group != null && !group.equals(metadata.getGroup())) {
@@ -242,21 +241,21 @@ public class JcloudsComputeProducer extends JcloudsProducer {
/**
* Retrieves the node state from the URI or from the exchange headers. The header will take precedence over the URI.
*/
- public NodeState getNodeState(Exchange exchange) {
- NodeState nodeState = null;
+ public NodeMetadata.Status getNodeState(Exchange exchange) {
+ NodeMetadata.Status nodeState = null;
String state = getEndpoint().getNodeState();
if (state != null) {
- nodeState = NodeState.valueOf(state);
+ nodeState = NodeMetadata.Status.valueOf(state);
}
if (exchange.getIn().getHeader(JcloudsConstants.NODE_STATE) != null) {
Object stateHeader = exchange.getIn().getHeader(JcloudsConstants.NODE_STATE);
if (stateHeader == null) {
nodeState = null;
- } else if (stateHeader instanceof NodeState) {
- nodeState = (NodeState) stateHeader;
+ } else if (stateHeader instanceof NodeMetadata.Status) {
+ nodeState = (NodeMetadata.Status) stateHeader;
} else {
- nodeState = NodeState.valueOf(String.valueOf(stateHeader));
+ nodeState = NodeMetadata.Status.valueOf(String.valueOf(stateHeader));
}
}
return nodeState;
http://git-wip-us.apache.org/repos/asf/camel/blob/42125fee/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 60618bb..8d9cf0f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -199,9 +199,9 @@
<jaxen-version>1.1.4</jaxen-version>
<jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
<jboss-logging-version>3.1.3.GA</jboss-logging-version>
- <jclouds-version>1.5.7</jclouds-version>
+ <jclouds-version>1.6.1-incubating</jclouds-version>
<!-- jclouds must use this guava version -->
- <jclouds-google-guava-version>13.0.1</jclouds-google-guava-version>
+ <jclouds-google-guava-version>14.0.1</jclouds-google-guava-version>
<jcr-version>2.0</jcr-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jdom-version>1.1.3</jdom-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/42125fee/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index f15027e..3f60052 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -18,7 +18,7 @@
<features name='camel-${project.version}'>
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository>
- <repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features</repository>
+ <repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features</repository>
<feature name='xml-specs-api' version='${servicemix-specs-version}' resolver='(obr)' start-level='10'>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>