You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/01/25 21:28:24 UTC
svn commit: r1235915 - in /karaf/cellar/branches/cellar-2.2.x:
assembly/src/main/resources/features.xml
cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
pom.xml
Author: jbonofre
Date: Wed Jan 25 20:28:24 2012
New Revision: 1235915
URL: http://svn.apache.org/viewvc?rev=1235915&view=rev
Log:
[KARAF-1170] Upgrade to jclouds 1.3.1
Modified:
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
karaf/cellar/branches/cellar-2.2.x/pom.xml
Modified: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml?rev=1235915&r1=1235914&r2=1235915&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml Wed Jan 25 20:28:24 2012
@@ -15,7 +15,7 @@
-->
<features name="karaf-cellar-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features</repository>
+ <repository>mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository>
<feature name='hazelcast' description='In memory data grid' version='${hazelcast.version}' resolver='(obr)'>
<bundle>mvn:com.hazelcast/hazelcast/${hazelcast.version}</bundle>
@@ -60,7 +60,7 @@
<feature name='cellar-cloud' description='Karaf Cellar Cloud Feature' version='${project.version}' resolver='(obr)'>
<feature version="${project.version}">cellar</feature>
- <feature version="${jclouds.karaf.version}">jclouds</feature>
+ <feature version="${jclouds.version}">jclouds</feature>
<!-- Adding S3 as the default Blobstore -->
<feature>jclouds-aws-s3</feature>
<bundle dependency='true'>mvn:joda-time/joda-time/${joda-time.version}</bundle>
Modified: karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java?rev=1235915&r1=1235914&r2=1235915&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryService.java Wed Jan 25 20:28:24 2012
@@ -184,7 +184,7 @@ public class BlobStoreDiscoveryService i
if (blobStore.blobExists(container, name)) {
blob = blobStore.getBlob(container, name);
} else {
- blob = blobStore.newBlob(name);
+ blob = blobStore.blobBuilder(name).build();
}
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: karaf/cellar/branches/cellar-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/pom.xml?rev=1235915&r1=1235914&r2=1235915&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Wed Jan 25 20:28:24 2012
@@ -39,8 +39,7 @@
<felix.configadmin.version>1.2.8</felix.configadmin.version>
<felix.webconsole.version>3.1.8</felix.webconsole.version>
<hazelcast.version>1.9.4.6</hazelcast.version>
- <jclouds.version>1.2.1</jclouds.version>
- <jclouds.karaf.version>1.2.1_1</jclouds.karaf.version>
+ <jclouds.version>1.3.1</jclouds.version>
<joda-time.version>1.6.2</joda-time.version>
<junit.version>4.7</junit.version>
<junit.bundle.version>4.7_3</junit.bundle.version>
@@ -485,10 +484,10 @@
<id>copy-notice</id>
<phase>generate-resources</phase>
<configuration>
- <tasks>
+ <target>
<copy file="NOTICE" todir="target/maven-shared-archive-resources/META-INF"
failonerror="false" overwrite="true"/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>