Author: iocanel
Date: Wed Sep 26 10:24:25 2012
New Revision: 1390376
URL: http://svn.apache.org/viewvc?rev=1390376&view=rev
Log:
[CAMEL-5650] Upgraded to jclouds 1.5.0. Replaced deprecated method calls.
Extended support to jclouds apis.
Modified:
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
camel/trunk/components/camel-jclouds/src/test/resources/blobstore-test.xml
camel/trunk/components/camel-jclouds/src/test/resources/compute-test.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/blueprintBlobStoreService.xml
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/springJcloudsRouteContext.xml
Modified:
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java?rev=1390376&r1=1390375&r2=1390376&view=diff
==============================================================================
---
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java
(original)
+++
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComponent.java
Wed Sep 26 10:24:25 2012
@@ -18,7 +18,6 @@ package org.apache.camel.component.jclou
import java.util.List;
import java.util.Map;
-
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.jclouds.blobstore.BlobStore;
@@ -48,7 +47,7 @@ public class JcloudsComponent extends De
if (JcloudsConstants.BLOBSTORE.endsWith(endpointType)) {
if (uriParts.length >= 2) {
String provider = uriParts[1];
- BlobStore blobStore = getBlobStoreForProvider(provider);
+ BlobStore blobStore = getBlobStore(provider);
endpoint = new JcloudsBlobStoreEndpoint(uri, this, blobStore);
} else {
throw new Exception("Invalid Endpoint URI. It should contains
a valid provider name");
@@ -56,7 +55,7 @@ public class JcloudsComponent extends De
} else if (JcloudsConstants.COMPUTE.endsWith(endpointType)) {
if (uriParts.length >= 2) {
String provider = uriParts[1];
- ComputeService computeService =
getComputeServiceForProvider(provider);
+ ComputeService computeService = getComputeService(provider);
endpoint = new JcloudsComputeEndpoint(uri, this,
computeService);
} else {
throw new Exception("Invalid Endpoint URI. It should contains
a valid provider name");
@@ -68,38 +67,38 @@ public class JcloudsComponent extends De
}
/**
- * Returns the {@link BlobStore} that matches the given provider.
- * @param provider The provider id.
+ * Returns the {@link BlobStore} that matches the given providerOrApi.
+ * @param providerOrApi The providerOrApi id.
* @return The matching {@link BlobStore}
*/
- protected BlobStore getBlobStoreForProvider(String provider) throws
Exception {
+ protected BlobStore getBlobStore(String providerOrApi) throws Exception {
if (blobStores != null && !blobStores.isEmpty()) {
for (BlobStore blobStore : blobStores) {
- if
(blobStore.getContext().getProviderSpecificContext().getId().equals(provider)) {
+ if
(blobStore.getContext().unwrap().getId().equals(providerOrApi)) {
return blobStore;
}
}
- throw new Exception(String.format("No blobstore found for
provider:%s", provider));
+ throw new Exception(String.format("No blobstore found for
provider:%s", providerOrApi));
} else {
throw new Exception("No blobstore available.");
}
}
/**
- * Returns the {@link ComputeService} that matches the given provider.
- * @param provider The provider id.
+ * Returns the {@link ComputeService} that matches the given providerOrApi.
+ * @param providerOrApi The providerOrApi id.
* @return The matching {@link ComputeService}
*/
- protected ComputeService getComputeServiceForProvider(String provider)
throws Exception {
+ protected ComputeService getComputeService(String providerOrApi) throws
Exception {
if (computeServices != null && !computeServices.isEmpty()) {
for (ComputeService computeService : computeServices) {
- if
(computeService.getContext().getProviderSpecificContext().getId().equals(provider))
{
+ if
(computeService.getContext().unwrap().getId().equals(providerOrApi)) {
return computeService;
}
}
- throw new Exception(String.format("No compute service found for
provider:%s", provider));
+ throw new Exception(String.format("No compute service found for
provider:%s", providerOrApi));
} else {
throw new Exception("No compute service available.");
}
Modified:
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java?rev=1390376&r1=1390375&r2=1390376&view=diff
==============================================================================
---
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
(original)
+++
camel/trunk/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
Wed Sep 26 10:24:25 2012
@@ -29,9 +29,9 @@ import org.apache.camel.component.mock.M
import org.apache.camel.converter.stream.StreamCacheConverter;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
-import org.jclouds.blobstore.BlobStoreContextFactory;
import org.junit.Test;
@@ -41,9 +41,8 @@ public class JcloudsBlobStoreProducerTes
private static final String TEST_CONTAINER = "testContainer";
private static final String TEST_BLOB_IN_DIR = "/dir/testBlob";
private static final String MESSAGE = "<test>This is a test</test>";
-
- BlobStoreContextFactory contextFactory = new BlobStoreContextFactory();
- BlobStoreContext blobStoreContext =
contextFactory.createContext("transient", "identity", "credential");
+
+ BlobStoreContext blobStoreContext =
ContextBuilder.newBuilder("transient").credentials("identity",
"credential").build(BlobStoreContext.class);
BlobStore blobStore = blobStoreContext.getBlobStore();
@Test
Modified:
camel/trunk/components/camel-jclouds/src/test/resources/blobstore-test.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/test/resources/blobstore-test.xml?rev=1390376&r1=1390375&r2=1390376&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/src/test/resources/blobstore-test.xml
(original)
+++ camel/trunk/components/camel-jclouds/src/test/resources/blobstore-test.xml
Wed Sep 26 10:24:25 2012
@@ -59,12 +59,21 @@
</property>
</bean>
- <bean id="blobStoreContextFactory"
class="org.jclouds.blobstore.BlobStoreContextFactory"/>
- <bean id="blobStoreContext" factory-bean="blobStoreContextFactory"
factory-method="createContext">
- <constructor-arg name="provider" value="transient"/>
- <constructor-arg name="identity" value="identity"/>
- <constructor-arg name="credential" value="credential"/>
+ <!-- BlobStore Service -->
+ <bean id="contextBuilder" class="org.jclouds.ContextBuilder"
factory-method="newBuilder">
+ <constructor-arg value="transient"/>
+ </bean>
+
+ <bean id="contextBuilderWithCreds" factory-bean="contextBuilder"
factory-method="credentials">
+ <constructor-arg value="identity"/>
+ <constructor-arg value="credential"/>
+ </bean>
+
+ <bean id="blobStoreContext" factory-bean="contextBuilderWithCreds"
factory-method="buildView">
+ <constructor-arg>
+ <value>org.jclouds.blobstore.BlobStoreContext</value>
+ </constructor-arg>
</bean>
<bean id="blobStore" factory-bean="blobStoreContext"
factory-method="getBlobStore"/>
Modified:
camel/trunk/components/camel-jclouds/src/test/resources/compute-test.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/test/resources/compute-test.xml?rev=1390376&r1=1390375&r2=1390376&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/src/test/resources/compute-test.xml
(original)
+++ camel/trunk/components/camel-jclouds/src/test/resources/compute-test.xml
Wed Sep 26 10:24:25 2012
@@ -44,14 +44,22 @@
</property>
</bean>
- <bean id="computeServiceContextFactory"
class="org.jclouds.compute.ComputeServiceContextFactory"/>
+ <!-- Compute Service -->
+ <bean id="contextBuilder" class="org.jclouds.ContextBuilder"
factory-method="newBuilder">
+ <constructor-arg value="stub"/>
+ </bean>
+
+ <bean id="contextBuilderWithCreds" factory-bean="contextBuilder"
factory-method="credentials">
+ <constructor-arg value="identity"/>
+ <constructor-arg value="credential"/>
+ </bean>
- <bean id="computeServiceContext"
factory-bean="computeServiceContextFactory" factory-method="createContext">
- <constructor-arg name="provider" value="stub"/>
- <constructor-arg name="identity" value="identity"/>
- <constructor-arg name="credential" value="credential"/>
+ <bean id="computeCtx" factory-bean="contextBuilderWithCreds"
factory-method="buildView">
+ <constructor-arg>
+ <value>org.jclouds.compute.ComputeServiceContext</value>
+ </constructor-arg>
</bean>
- <bean id="computeService" factory-bean="computeServiceContext"
factory-method="getComputeService"/>
+ <bean id="computeService" factory-bean="computeCtx"
factory-method="getComputeService"/>
</beans>
\ No newline at end of file
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1390376&r1=1390375&r2=1390376&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Sep 26 10:24:25 2012
@@ -164,8 +164,8 @@
<jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
<jaxen-version>1.1.4</jaxen-version>
<jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
- <jclouds-version>1.4.0</jclouds-version>
- <jclouds-feature-version>1.4.0</jclouds-feature-version>
+ <jclouds-version>1.5.0</jclouds-version>
+ <jclouds-feature-version>1.5.0</jclouds-feature-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jdom-version>1.1.3</jdom-version>
<jetty-version>7.6.7.v20120910</jetty-version>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1390376&r1=1390375&r2=1390376&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Wed Sep 26 10:24:25 2012
@@ -163,6 +163,17 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<profiles>
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/blueprintBlobStoreService.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/blueprintBlobStoreService.xml?rev=1390376&r1=1390375&r2=1390376&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/blueprintBlobStoreService.xml
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/blueprintBlobStoreService.xml
Wed Sep 26 10:24:25 2012
@@ -17,16 +17,22 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0";
default-activation="lazy">
- <bean id="blobStoreContextFactory"
class="org.jclouds.blobstore.BlobStoreContextFactory"/>
+ <!-- BlobStore Service -->
+ <bean id="contextBuilder" class="org.jclouds.ContextBuilder"
factory-method="newBuilder">
+ <argument value="transient"/>
+ </bean>
- <bean id="blobStoreContext" factory-ref="blobStoreContextFactory"
factory-method="createContext">
- <argument index="0" value="transient"/>
- <argument index="1" value="identity"/>
- <argument index="2" value="credential"/>
+ <bean id="contextBuilderWithCreds" factory-ref="contextBuilder"
factory-method="credentials">
+ <argument index="0" value="identity"/>
+ <argument index="1" value="credential"/>
</bean>
- <bean id="blobStore" factory-ref="blobStoreContext"
factory-method="getBlobStore"/>
+ <bean id="blobStoreContext" factory-ref="contextBuilderWithCreds"
factory-method="buildView">
+ <argument value="org.jclouds.blobstore.BlobStoreContext"/>
+ </bean>
+ <bean id="blobStore" factory-ref="blobStoreContext"
factory-method="getBlobStore"/>
+
<service ref="blobStore" interface="org.jclouds.blobstore.BlobStore"/>
</blueprint>
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/springJcloudsRouteContext.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/springJcloudsRouteContext.xml?rev=1390376&r1=1390375&r2=1390376&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/springJcloudsRouteContext.xml
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jclouds/springJcloudsRouteContext.xml
Wed Sep 26 10:24:25 2012
@@ -43,12 +43,20 @@
</property>
</bean>
- <bean id="blobStoreContextFactory"
class="org.jclouds.blobstore.BlobStoreContextFactory"/>
+ <!-- BlobStore Service -->
+ <bean id="contextBuilder" class="org.jclouds.ContextBuilder"
factory-method="newBuilder">
+ <constructor-arg value="transient"/>
+ </bean>
+
+ <bean id="contextBuilderWithCreds" factory-bean="contextBuilder"
factory-method="credentials">
+ <constructor-arg value="identity"/>
+ <constructor-arg value="credential"/>
+ </bean>
- <bean id="blobStoreContext" factory-bean="blobStoreContextFactory"
factory-method="createContext">
- <constructor-arg name="provider" value="transient"/>
- <constructor-arg name="identity" value="identity"/>
- <constructor-arg name="credential" value="credential"/>
+ <bean id="blobStoreContext" factory-bean="contextBuilderWithCreds"
factory-method="buildView">
+ <constructor-arg>
+ <value>org.jclouds.blobstore.BlobStoreContext</value>
+ </constructor-arg>
</bean>
<bean id="blobStore" factory-bean="blobStoreContext"
factory-method="getBlobStore"/>
