You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/05 23:43:05 UTC

[1/2] git commit: JCLOUDS-40 Remove last reference to AsyncBlobStore in Swift.

Repository: jclouds-labs-openstack
Updated Branches:
  refs/heads/1.8.x 1b10bae61 -> 47416116b


JCLOUDS-40 Remove last reference to AsyncBlobStore in Swift.


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/5887d8de
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/5887d8de
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/5887d8de

Branch: refs/heads/1.8.x
Commit: 5887d8decaf74cecd64186c6bf0c9c77d26a4728
Parents: 1b10bae
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Oct 5 12:01:43 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sun Oct 5 14:41:57 2014 -0700

----------------------------------------------------------------------
 .../v1/blobstore/RegionScopedBlobStoreContext.java     | 13 +------------
 .../RegionScopedBlobStoreContextLiveTest.java          |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/5887d8de/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
index 8f99416..de1f50d 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContext.java
@@ -26,12 +26,10 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.jclouds.Context;
-import org.jclouds.blobstore.AsyncBlobStore;
 import org.jclouds.blobstore.BlobRequestSigner;
 import org.jclouds.blobstore.BlobStore;
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.blobstore.attr.ConsistencyModel;
-import org.jclouds.blobstore.internal.SubmissionAsyncBlobStore;
 import org.jclouds.internal.BaseView;
 import org.jclouds.location.Provider;
 import org.jclouds.location.Region;
@@ -125,6 +123,7 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
       return blobRequestSigner.apply(regionId);
    }
 
+<<<<<<< HEAD
    /**
     * @param regionId
     *           valid region id from {@link #getConfiguredRegions()}
@@ -197,16 +196,6 @@ public class RegionScopedBlobStoreContext extends BaseView implements BlobStoreC
       return getSigner(implicitRegionId.get());
    }
 
-   /**
-    * @deprecated {@link AsyncBlobStore} is no longer supported. Please use {@link BlobStore} as
-    *             this method will be removed in jclouds 2.0.
-    */
-   @Override
-   @Deprecated
-   public AsyncBlobStore getAsyncBlobStore() {
-      return getAsyncBlobStore(implicitRegionId.get());
-   }
-
    @Override
    public Utils utils() {
       return utils;

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/5887d8de/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java
index 673ee71..a762b8b 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedBlobStoreContextLiveTest.java
@@ -69,7 +69,7 @@ public class RegionScopedBlobStoreContextLiveTest extends BaseBlobStoreIntegrati
    public void tryList() throws InterruptedException, ExecutionException {
       RegionScopedBlobStoreContext ctx = RegionScopedBlobStoreContext.class.cast(view);
       for (String regionId : ctx.getConfiguredRegions()) {
-         assertEquals(ctx.getAsyncBlobStore(regionId).list().get(), ctx.getBlobStore(regionId).list());
+         ctx.getBlobStore(regionId).list();
       }
    }
 


[2/2] git commit: Fix poms so that modernizer doesn't fail on snapshot.

Posted by ad...@apache.org.
Fix poms so that modernizer doesn't fail on snapshot.


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/47416116
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/47416116
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/47416116

Branch: refs/heads/1.8.x
Commit: 47416116b8acfd11468f8b3ed6a3ceddb508e0bb
Parents: 5887d8d
Author: Adrian Cole <ad...@gmail.com>
Authored: Sun Oct 5 13:32:34 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Sun Oct 5 14:42:50 2014 -0700

----------------------------------------------------------------------
 openstack-glance/pom.xml          | 14 ++++++++++++++
 openstack-marconi/pom.xml         | 14 ++++++++++++++
 openstack-neutron/pom.xml         | 14 ++++++++++++++
 openstack-swift/pom.xml           | 14 ++++++++++++++
 pom.xml                           | 15 +++++++++++++++
 rackspace-autoscale-uk/pom.xml    | 14 ++++++++++++++
 rackspace-autoscale-us/pom.xml    | 14 ++++++++++++++
 rackspace-autoscale/pom.xml       | 14 ++++++++++++++
 rackspace-cloudbigdata-us/pom.xml | 14 ++++++++++++++
 rackspace-cloudbigdata/pom.xml    | 14 ++++++++++++++
 rackspace-cloudfiles-uk/pom.xml   | 14 ++++++++++++++
 rackspace-cloudfiles-us/pom.xml   | 14 ++++++++++++++
 rackspace-cloudfiles/pom.xml      | 14 ++++++++++++++
 rackspace-cloudqueues-uk/pom.xml  | 14 ++++++++++++++
 rackspace-cloudqueues-us/pom.xml  | 14 ++++++++++++++
 15 files changed, 211 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/openstack-glance/pom.xml
----------------------------------------------------------------------
diff --git a/openstack-glance/pom.xml b/openstack-glance/pom.xml
index 67479ec..6a5c784 100644
--- a/openstack-glance/pom.xml
+++ b/openstack-glance/pom.xml
@@ -65,6 +65,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/openstack-marconi/pom.xml
----------------------------------------------------------------------
diff --git a/openstack-marconi/pom.xml b/openstack-marconi/pom.xml
index 4f015c9..a0811d8 100644
--- a/openstack-marconi/pom.xml
+++ b/openstack-marconi/pom.xml
@@ -58,6 +58,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/openstack-neutron/pom.xml
----------------------------------------------------------------------
diff --git a/openstack-neutron/pom.xml b/openstack-neutron/pom.xml
index 59760f6..375afe5 100644
--- a/openstack-neutron/pom.xml
+++ b/openstack-neutron/pom.xml
@@ -64,6 +64,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/openstack-swift/pom.xml
----------------------------------------------------------------------
diff --git a/openstack-swift/pom.xml b/openstack-swift/pom.xml
index 3ed414e..b1a2471 100644
--- a/openstack-swift/pom.xml
+++ b/openstack-swift/pom.xml
@@ -60,6 +60,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 65b4c5b..e645bde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,21 @@
     </repository>
   </repositories>
 
+
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <modules>
     <module>openstack-glance</module>
     <module>openstack-neutron</module>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-autoscale-uk/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-autoscale-uk/pom.xml b/rackspace-autoscale-uk/pom.xml
index bd2f951..41cd90b 100644
--- a/rackspace-autoscale-uk/pom.xml
+++ b/rackspace-autoscale-uk/pom.xml
@@ -66,6 +66,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.labs</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-autoscale-us/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-autoscale-us/pom.xml b/rackspace-autoscale-us/pom.xml
index e30f15d..be01be3 100644
--- a/rackspace-autoscale-us/pom.xml
+++ b/rackspace-autoscale-us/pom.xml
@@ -65,6 +65,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.labs</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-autoscale/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/pom.xml b/rackspace-autoscale/pom.xml
index 2c9c8d0..9d1afbc 100644
--- a/rackspace-autoscale/pom.xml
+++ b/rackspace-autoscale/pom.xml
@@ -65,6 +65,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.api</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-cloudbigdata-us/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudbigdata-us/pom.xml b/rackspace-cloudbigdata-us/pom.xml
index 934cf89..fa6d7fd 100644
--- a/rackspace-cloudbigdata-us/pom.xml
+++ b/rackspace-cloudbigdata-us/pom.xml
@@ -65,6 +65,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.labs</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-cloudbigdata/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudbigdata/pom.xml b/rackspace-cloudbigdata/pom.xml
index 28b43a1..de29c16 100644
--- a/rackspace-cloudbigdata/pom.xml
+++ b/rackspace-cloudbigdata/pom.xml
@@ -65,6 +65,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-cloudfiles-uk/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-uk/pom.xml b/rackspace-cloudfiles-uk/pom.xml
index 0a8854f..abdb89a 100644
--- a/rackspace-cloudfiles-uk/pom.xml
+++ b/rackspace-cloudfiles-uk/pom.xml
@@ -62,6 +62,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.labs</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-cloudfiles-us/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles-us/pom.xml b/rackspace-cloudfiles-us/pom.xml
index d8477a7..f2282fd 100644
--- a/rackspace-cloudfiles-us/pom.xml
+++ b/rackspace-cloudfiles-us/pom.xml
@@ -62,6 +62,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.labs</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-cloudfiles/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudfiles/pom.xml b/rackspace-cloudfiles/pom.xml
index a47a2e2..ff2a3f3 100644
--- a/rackspace-cloudfiles/pom.xml
+++ b/rackspace-cloudfiles/pom.xml
@@ -57,6 +57,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds.labs</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-cloudqueues-uk/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudqueues-uk/pom.xml b/rackspace-cloudqueues-uk/pom.xml
index 29e4456..6cab448 100644
--- a/rackspace-cloudqueues-uk/pom.xml
+++ b/rackspace-cloudqueues-uk/pom.xml
@@ -63,6 +63,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds</groupId>

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/47416116/rackspace-cloudqueues-us/pom.xml
----------------------------------------------------------------------
diff --git a/rackspace-cloudqueues-us/pom.xml b/rackspace-cloudqueues-us/pom.xml
index 51926b3..cb8a5ea 100644
--- a/rackspace-cloudqueues-us/pom.xml
+++ b/rackspace-cloudqueues-us/pom.xml
@@ -63,6 +63,20 @@
     </repository>
   </repositories>
 
+  <!-- For modernizer, which depends on jclouds-resources snapshot. -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache-snapshots</id>
+      <url>https://repository.apache.org/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.jclouds</groupId>