You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2015/01/09 20:22:29 UTC
[1/3] jclouds git commit: Use AutoService to generate service loader
metadata
Repository: jclouds
Updated Branches:
refs/heads/master d6d06b71f -> d3c1e2eab
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudblockstorage-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudblockstorage-uk/pom.xml b/providers/rackspace-cloudblockstorage-uk/pom.xml
index 87841c9..c369e83 100644
--- a/providers/rackspace-cloudblockstorage-uk/pom.xml
+++ b/providers/rackspace-cloudblockstorage-uk/pom.xml
@@ -39,12 +39,7 @@
<test.rackspace-cloudblockstorage-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudblockstorage-uk.credential>
<test.rackspace-cloudblockstorage-uk.template />
<jclouds.osgi.export>org.jclouds.rackspace.cloudblockstorage.uk*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -107,6 +102,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java
index 01b8c6a..51b532f 100644
--- a/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java
+++ b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java
@@ -34,12 +34,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Next Generation Cloud Block Storage.
+ * Implementation of {@link ProviderMetadata} for Rackspace Next Generation Cloud Block Storage.
*/
+@AutoService(ProviderMetadata.class)
public class CloudBlockStorageUKProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 97fe43d..0000000
--- a/providers/rackspace-cloudblockstorage-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudblockstorage.uk.CloudBlockStorageUKProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudblockstorage-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudblockstorage-us/pom.xml b/providers/rackspace-cloudblockstorage-us/pom.xml
index 9a73412..1b68a35 100644
--- a/providers/rackspace-cloudblockstorage-us/pom.xml
+++ b/providers/rackspace-cloudblockstorage-us/pom.xml
@@ -39,12 +39,7 @@
<test.rackspace-cloudblockstorage-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudblockstorage-us.credential>
<test.rackspace-cloudblockstorage-us.template />
<jclouds.osgi.export>org.jclouds.rackspace.cloudblockstorage.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -107,6 +102,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java
index 5741b15..19675fa 100644
--- a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java
+++ b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java
@@ -34,12 +34,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Next Generation Cloud Block Storage.
+ * Implementation of {@link ProviderMetadata} for Rackspace Next Generation Cloud Block Storage.
*/
+@AutoService(ProviderMetadata.class)
public class CloudBlockStorageUSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 84a96e2..0000000
--- a/providers/rackspace-cloudblockstorage-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudblockstorage.us.CloudBlockStorageUSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddatabases-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-uk/pom.xml b/providers/rackspace-clouddatabases-uk/pom.xml
index 887ae2b..3050ee6 100644
--- a/providers/rackspace-clouddatabases-uk/pom.xml
+++ b/providers/rackspace-clouddatabases-uk/pom.xml
@@ -39,12 +39,7 @@
<test.rackspace-clouddatabases-uk.credential>${test.rackspace-uk.credential}</test.rackspace-clouddatabases-uk.credential>
<test.rackspace-clouddatabases-uk.template />
<jclouds.osgi.export>org.jclouds.rackspace.clouddatabases.uk*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -107,6 +102,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java b/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java
index fa146d6..307e86f 100644
--- a/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java
+++ b/providers/rackspace-clouddatabases-uk/src/main/java/org/jclouds/rackspace/clouddatabases/uk/CloudDatabasesUKProviderMetadata.java
@@ -36,12 +36,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Databases.
+ * Implementation of {@link ProviderMetadata} for Rackspace Cloud Databases.
*/
+@AutoService(ProviderMetadata.class)
public class CloudDatabasesUKProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddatabases-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-clouddatabases-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index a6a3c9a..0000000
--- a/providers/rackspace-clouddatabases-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.clouddatabases.uk.CloudDatabasesUKProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddatabases-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-us/pom.xml b/providers/rackspace-clouddatabases-us/pom.xml
index 1e1298b..f302bec 100644
--- a/providers/rackspace-clouddatabases-us/pom.xml
+++ b/providers/rackspace-clouddatabases-us/pom.xml
@@ -39,12 +39,7 @@
<test.rackspace-clouddatabases-us.credential>${test.rackspace-us.credential}</test.rackspace-clouddatabases-us.credential>
<test.rackspace-clouddatabases-us.template />
<jclouds.osgi.export>org.jclouds.rackspace.clouddatabases.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -107,6 +102,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java b/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java
index f72e4fa..4d595a7 100644
--- a/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java
+++ b/providers/rackspace-clouddatabases-us/src/main/java/org/jclouds/rackspace/clouddatabases/us/CloudDatabasesUSProviderMetadata.java
@@ -36,12 +36,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Databases.
+ * Implementation of {@link ProviderMetadata} for Rackspace Cloud Databases.
*/
+@AutoService(ProviderMetadata.class)
public class CloudDatabasesUSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddatabases-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-clouddatabases-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 607e501..0000000
--- a/providers/rackspace-clouddatabases-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.clouddatabases.us.CloudDatabasesUSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddns-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddns-uk/pom.xml b/providers/rackspace-clouddns-uk/pom.xml
index 57f8129..94754fe 100644
--- a/providers/rackspace-clouddns-uk/pom.xml
+++ b/providers/rackspace-clouddns-uk/pom.xml
@@ -39,12 +39,7 @@
<test.rackspace-clouddns-uk.credential>${test.rackspace-uk.credential}</test.rackspace-clouddns-uk.credential>
<test.rackspace-clouddns-uk.template />
<jclouds.osgi.export>org.jclouds.rackspace.clouddns.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -107,6 +102,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java b/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java
index ee0616a..7036f64 100644
--- a/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java
+++ b/providers/rackspace-clouddns-uk/src/main/java/org/jclouds/rackspace/clouddns/uk/CloudDNSUKProviderMetadata.java
@@ -23,9 +23,12 @@ import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.clouddns.v1.CloudDNSApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace DNS UK.
+ * Implementation of {@link ProviderMetadata} for Rackspace DNS UK.
*/
+@AutoService(ProviderMetadata.class)
public class CloudDNSUKProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddns-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddns-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-clouddns-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index dbb2966..0000000
--- a/providers/rackspace-clouddns-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.clouddns.uk.CloudDNSUKProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddns-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddns-us/pom.xml b/providers/rackspace-clouddns-us/pom.xml
index 84db25e..f0d5773 100644
--- a/providers/rackspace-clouddns-us/pom.xml
+++ b/providers/rackspace-clouddns-us/pom.xml
@@ -39,12 +39,7 @@
<test.rackspace-clouddns-us.credential>${test.rackspace-us.credential}</test.rackspace-clouddns-us.credential>
<test.rackspace-clouddns-us.template />
<jclouds.osgi.export>org.jclouds.rackspace.clouddns.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -126,6 +121,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java b/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java
index c35b8de..941e983 100644
--- a/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java
+++ b/providers/rackspace-clouddns-us/src/main/java/org/jclouds/rackspace/clouddns/us/CloudDNSUSProviderMetadata.java
@@ -23,9 +23,12 @@ import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.clouddns.v1.CloudDNSApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace DNS US.
+ * Implementation of {@link ProviderMetadata} for Rackspace DNS US.
*/
+@AutoService(ProviderMetadata.class)
public class CloudDNSUSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-clouddns-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddns-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-clouddns-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index b2db3e2..0000000
--- a/providers/rackspace-clouddns-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.clouddns.us.CloudDNSUSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudloadbalancers-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudloadbalancers-uk/pom.xml b/providers/rackspace-cloudloadbalancers-uk/pom.xml
index 73c1135..dd61880 100644
--- a/providers/rackspace-cloudloadbalancers-uk/pom.xml
+++ b/providers/rackspace-cloudloadbalancers-uk/pom.xml
@@ -102,6 +102,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java
index ffd4111..9776ab7 100644
--- a/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java
+++ b/providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java
@@ -27,9 +27,12 @@ import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud LoadBalancers UK.
+ * Implementation of {@link ProviderMetadata} for Rackspace Cloud LoadBalancers UK.
*/
+@AutoService(ProviderMetadata.class)
public class CloudLoadBalancersUKProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 49592e1..0000000
--- a/providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudloadbalancers.uk.CloudLoadBalancersUKProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudloadbalancers-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudloadbalancers-us/pom.xml b/providers/rackspace-cloudloadbalancers-us/pom.xml
index 467f242..bb227c6 100644
--- a/providers/rackspace-cloudloadbalancers-us/pom.xml
+++ b/providers/rackspace-cloudloadbalancers-us/pom.xml
@@ -102,6 +102,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java
index 3aeb55c..262b8b2 100644
--- a/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java
+++ b/providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java
@@ -27,9 +27,12 @@ import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud LoadBalancers US.
+ * Implementation of {@link ProviderMetadata} for Rackspace Cloud LoadBalancers US.
*/
+@AutoService(ProviderMetadata.class)
public class CloudLoadBalancersUSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index ae58e28..0000000
--- a/providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudloadbalancers.us.CloudLoadBalancersUSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudservers-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudservers-uk/pom.xml b/providers/rackspace-cloudservers-uk/pom.xml
index 0580133..c65a5be 100644
--- a/providers/rackspace-cloudservers-uk/pom.xml
+++ b/providers/rackspace-cloudservers-uk/pom.xml
@@ -39,12 +39,7 @@
<test.rackspace-cloudservers-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudservers-uk.credential>
<test.rackspace-cloudservers-uk.template />
<jclouds.osgi.export>org.jclouds.rackspace.cloudservers.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -110,6 +105,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java
index 80c94ea..8f35190 100644
--- a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java
+++ b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java
@@ -35,12 +35,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.rackspace.cloudservers.uk.config.CloudServersUKComputeServiceContextModule;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Next Generation Cloud Servers.
+ * Implementation of {@link ProviderMetadata} for Rackspace Next Generation Cloud Servers.
*/
+@AutoService(ProviderMetadata.class)
public class CloudServersUKProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 8c85e8b..0000000
--- a/providers/rackspace-cloudservers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudservers.uk.CloudServersUKProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudservers-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudservers-us/pom.xml b/providers/rackspace-cloudservers-us/pom.xml
index 14d4cec..a8ce0a2 100644
--- a/providers/rackspace-cloudservers-us/pom.xml
+++ b/providers/rackspace-cloudservers-us/pom.xml
@@ -39,12 +39,7 @@
<test.rackspace-cloudservers-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudservers-us.credential>
<test.rackspace-cloudservers-us.template />
<jclouds.osgi.export>org.jclouds.rackspace.cloudservers.us*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -110,6 +105,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
index 9502934..dc17fae 100644
--- a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
+++ b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
@@ -35,12 +35,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
import org.jclouds.rackspace.cloudservers.us.config.CloudServersUSComputeServiceContextModule;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Next Generation Cloud Servers.
+ * Implementation of {@link ProviderMetadata} for Rackspace Next Generation Cloud Servers.
*/
+@AutoService(ProviderMetadata.class)
public class CloudServersUSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index b941fc2..0000000
--- a/providers/rackspace-cloudservers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudservers.us.CloudServersUSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/serverlove-z1-man/pom.xml
----------------------------------------------------------------------
diff --git a/providers/serverlove-z1-man/pom.xml b/providers/serverlove-z1-man/pom.xml
index ea2f074..b700a24 100644
--- a/providers/serverlove-z1-man/pom.xml
+++ b/providers/serverlove-z1-man/pom.xml
@@ -86,6 +86,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java
index 6a66d9e..8bda256 100644
--- a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java
+++ b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java
@@ -24,12 +24,14 @@ import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.serverlove.config.ServerloveImagesModule;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Serverlove Manchester.
+ * Implementation of {@link ProviderMetadata} for Serverlove Manchester.
*/
+@AutoService(ProviderMetadata.class)
public class ServerloveManchesterProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/serverlove-z1-man/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/serverlove-z1-man/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/serverlove-z1-man/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index f50adb3..0000000
--- a/providers/serverlove-z1-man/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.serverlove.ServerloveManchesterProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/skalicloud-sdg-my/pom.xml
----------------------------------------------------------------------
diff --git a/providers/skalicloud-sdg-my/pom.xml b/providers/skalicloud-sdg-my/pom.xml
index de0e90d..90d1e98 100644
--- a/providers/skalicloud-sdg-my/pom.xml
+++ b/providers/skalicloud-sdg-my/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java b/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java
index 86231ea..72bdc90 100644
--- a/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java
+++ b/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java
@@ -23,9 +23,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for SkaliCloud Malaysia.
+ * Implementation of {@link ProviderMetadata} for SkaliCloud Malaysia.
*/
+@AutoService(ProviderMetadata.class)
public class SkaliCloudMalaysiaProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/skalicloud-sdg-my/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/skalicloud-sdg-my/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/skalicloud-sdg-my/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index bb9797a..0000000
--- a/providers/skalicloud-sdg-my/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.skalicloud.SkaliCloudMalaysiaProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/softlayer/pom.xml
----------------------------------------------------------------------
diff --git a/providers/softlayer/pom.xml b/providers/softlayer/pom.xml
index 1dc985d..de1286d 100644
--- a/providers/softlayer/pom.xml
+++ b/providers/softlayer/pom.xml
@@ -97,7 +97,13 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
index 6e60141..2fbfe44 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
@@ -16,20 +16,23 @@
*/
package org.jclouds.softlayer;
-import org.jclouds.providers.ProviderMetadata;
-import org.jclouds.providers.internal.BaseProviderMetadata;
-
-import java.net.URI;
-import java.util.Properties;
-
import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE;
import static org.jclouds.softlayer.reference.SoftLayerConstants.PROPERTY_SOFTLAYER_INCLUDE_PUBLIC_IMAGES;
import static org.jclouds.softlayer.reference.SoftLayerConstants.PROPERTY_SOFTLAYER_VIRTUALGUEST_ACTIVE_TRANSACTIONS_DELAY;
import static org.jclouds.softlayer.reference.SoftLayerConstants.PROPERTY_SOFTLAYER_VIRTUALGUEST_LOGIN_DETAILS_DELAY;
+import java.net.URI;
+import java.util.Properties;
+
+import org.jclouds.providers.ProviderMetadata;
+import org.jclouds.providers.internal.BaseProviderMetadata;
+
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.providers.ProviderMetadata} for SoftLayer.
+ * Implementation of {@link ProviderMetadata} for SoftLayer.
*/
+@AutoService(ProviderMetadata.class)
public class SoftLayerProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index b79ad35..0000000
--- a/providers/softlayer/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.softlayer.SoftLayerProviderMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/ultradns-ws/pom.xml
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/pom.xml b/providers/ultradns-ws/pom.xml
index 015d3f2..725ccf8 100644
--- a/providers/ultradns-ws/pom.xml
+++ b/providers/ultradns-ws/pom.xml
@@ -67,6 +67,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java
index bf7dcf3..26d962c 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/UltraDNSWSProviderMetadata.java
@@ -22,10 +22,12 @@ import java.util.Properties;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Neustar
- * UltraDNS.
+ * Implementation of {@link ProviderMetadata} for Neustar UltraDNS.
*/
+@AutoService(ProviderMetadata.class)
public class UltraDNSWSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/ultradns-ws/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/ultradns-ws/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 316f598..0000000
--- a/providers/ultradns-ws/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.ultradns.ws.UltraDNSWSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/skeletons/standalone-compute/pom.xml
----------------------------------------------------------------------
diff --git a/skeletons/standalone-compute/pom.xml b/skeletons/standalone-compute/pom.xml
index 2b01bbd..23becce 100644
--- a/skeletons/standalone-compute/pom.xml
+++ b/skeletons/standalone-compute/pom.xml
@@ -79,6 +79,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java
----------------------------------------------------------------------
diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java
index 1e2e54b..635d317 100644
--- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java
+++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java
@@ -18,13 +18,17 @@ package org.jclouds.servermanager;
import java.net.URI;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.internal.BaseApiMetadata;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.servermanager.compute.config.ServerManagerComputeServiceContextModule;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link ApiMetadata} for an example of library integration (ServerManager)
*/
+@AutoService(ApiMetadata.class)
public class ServerManagerApiMetadata extends BaseApiMetadata {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/skeletons/standalone-compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/skeletons/standalone-compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/skeletons/standalone-compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index cbad9e4..0000000
--- a/skeletons/standalone-compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.servermanager.ServerManagerApiMetadata
\ No newline at end of file
[2/3] jclouds git commit: Use AutoService to generate service loader
metadata
Posted by jd...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/blobstore/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/blobstore/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/blobstore/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index a5bb992..0000000
--- a/blobstore/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.blobstore.TransientApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/compute/pom.xml
----------------------------------------------------------------------
diff --git a/compute/pom.xml b/compute/pom.xml
index 02bcfa6..cb7a11d 100644
--- a/compute/pom.xml
+++ b/compute/pom.xml
@@ -64,6 +64,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java b/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java
index 0d6a2a6..020bac7 100644
--- a/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java
+++ b/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java
@@ -18,13 +18,17 @@ package org.jclouds.compute.stub;
import java.net.URI;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.internal.BaseApiMetadata;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.stub.config.StubComputeServiceContextModule;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link ApiMetadata} for jclouds in-memory (Stub) API
*/
+@AutoService(ApiMetadata.class)
public class StubApiMetadata extends BaseApiMetadata {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 542beaa..0000000
--- a/compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.compute.stub.StubApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index eb0c915..1366fd6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -113,6 +113,11 @@
<artifactId>auto-value</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java b/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java
index 5a57473..9854efd 100644
--- a/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java
+++ b/core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java
@@ -20,11 +20,15 @@ import org.jclouds.logging.Logger;
import org.jclouds.logging.config.LoggingModule;
import org.jclouds.logging.jdk.JDKLogger;
+import com.google.auto.service.AutoService;
+
/**
* Configures logging of type {@link JDKLogger}
*/
+@AutoService(LoggingModule.class)
public class JDKLoggingModule extends LoggingModule {
- public Logger.LoggerFactory createLoggerFactory() {
- return new JDKLogger.JDKLoggerFactory();
- }
+ @Override
+ public Logger.LoggerFactory createLoggerFactory() {
+ return new JDKLogger.JDKLoggerFactory();
+ }
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule b/core/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
deleted file mode 100644
index 1bf9839..0000000
--- a/core/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.logging.jdk.config.JDKLoggingModule
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java
index 6cb7127..485ebe0 100644
--- a/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java
+++ b/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java
@@ -21,9 +21,12 @@ import java.net.URI;
import org.jclouds.http.IntegrationTestClient;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of @ link org.jclouds.types.ApiMetadata} for testing.
+ * Implementation of {@link ApiMetadata} for testing.
*/
+@AutoService(ApiMetadata.class)
public class JcloudsTestBlobStoreApiMetadata extends BaseHttpApiMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java
index 66f080c..1ebb0c7 100644
--- a/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java
+++ b/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java
@@ -21,9 +21,12 @@ import java.net.URI;
import org.jclouds.http.IntegrationTestClient;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of @ link org.jclouds.types.ApiMetadata} for testing.
+ * Implementation of {@link ApiMetadata} for testing.
*/
+@AutoService(ApiMetadata.class)
public class JcloudsTestComputeApiMetadata extends BaseHttpApiMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java
index 12988d2..a0a7f60 100644
--- a/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java
+++ b/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java
@@ -21,9 +21,12 @@ import java.net.URI;
import org.jclouds.http.IntegrationTestClient;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of @ link org.jclouds.types.ApiMetadata} for testing.
+ * Implementation of {@link ApiMetadata} for testing.
*/
+@AutoService(ApiMetadata.class)
public class JcloudsTestYetAnotherComputeApiMetadata extends BaseHttpApiMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
index 8bca329..897dc2f 100644
--- a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
+++ b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
@@ -21,17 +21,19 @@ import java.net.URI;
import org.jclouds.apis.JcloudsTestBlobStoreApiMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
/**
- * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing.
+ * Implementation of {@link ProviderMetadata} for testing.
*/
+@AutoService(ProviderMetadata.class)
public class JcloudsTestBlobStoreProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
return new Builder();
}
-
+
@Override
public Builder toBuilder() {
return Builder.class.cast(builder().fromProviderMetadata(this));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
index 790ebff..d57a3de 100644
--- a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
+++ b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
@@ -21,11 +21,13 @@ import java.net.URI;
import org.jclouds.apis.JcloudsTestComputeApiMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
/**
- * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing.
+ * Implementation of {@link ProviderMetadata} for testing.
*/
+@AutoService(ProviderMetadata.class)
public class JcloudsTestComputeProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
@@ -36,7 +38,7 @@ public class JcloudsTestComputeProviderMetadata extends BaseProviderMetadata {
public Builder toBuilder() {
return Builder.class.cast(builder().fromProviderMetadata(this));
}
-
+
public JcloudsTestComputeProviderMetadata() {
super(builder());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java
index aaa51dc..cfa7b03 100644
--- a/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java
+++ b/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java
@@ -21,13 +21,15 @@ import java.net.URI;
import org.jclouds.apis.JcloudsTestComputeApiMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
/**
- * Implementation of @ link org.jclouds.types.ProviderMetadata} for testing.
+ * Implementation of {@link ProviderMetadata} for testing.
*/
+@AutoService(ProviderMetadata.class)
public class JcloudsTestYetAnotherComputeProviderMetadata extends BaseProviderMetadata {
-
+
public static Builder builder() {
return new Builder();
}
@@ -36,7 +38,7 @@ public class JcloudsTestYetAnotherComputeProviderMetadata extends BaseProviderMe
public Builder toBuilder() {
return Builder.class.cast(builder().fromProviderMetadata(this));
}
-
+
public JcloudsTestYetAnotherComputeProviderMetadata() {
super(builder());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/test/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/core/src/test/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/core/src/test/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 5a98023..0000000
--- a/core/src/test/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1,3 +0,0 @@
-org.jclouds.apis.JcloudsTestBlobStoreApiMetadata
-org.jclouds.apis.JcloudsTestComputeApiMetadata
-org.jclouds.apis.JcloudsTestYetAnotherComputeApiMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/core/src/test/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/core/src/test/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/core/src/test/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 6e9898b..0000000
--- a/core/src/test/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1,3 +0,0 @@
-org.jclouds.providers.JcloudsTestBlobStoreProviderMetadata
-org.jclouds.providers.JcloudsTestComputeProviderMetadata
-org.jclouds.providers.JcloudsTestYetAnotherComputeProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/drivers/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/drivers/log4j/pom.xml b/drivers/log4j/pom.xml
index fe47403..550f385 100644
--- a/drivers/log4j/pom.xml
+++ b/drivers/log4j/pom.xml
@@ -65,7 +65,11 @@
<artifactId>log4j</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java
----------------------------------------------------------------------
diff --git a/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java b/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java
index 4dd69fe..a406181 100644
--- a/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java
+++ b/drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java
@@ -20,9 +20,12 @@ import org.jclouds.logging.Logger.LoggerFactory;
import org.jclouds.logging.config.LoggingModule;
import org.jclouds.logging.log4j.Log4JLogger;
+import com.google.auto.service.AutoService;
+
/**
* Configures logging of type {@link Log4JLogger}
*/
+@AutoService(LoggingModule.class)
public class Log4JLoggingModule extends LoggingModule {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/drivers/log4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
----------------------------------------------------------------------
diff --git a/drivers/log4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule b/drivers/log4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
deleted file mode 100644
index e6d96ef..0000000
--- a/drivers/log4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.logging.log4j.config.Log4JLoggingModule
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/drivers/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/drivers/slf4j/pom.xml b/drivers/slf4j/pom.xml
index 56d16f0..1f329a4 100644
--- a/drivers/slf4j/pom.xml
+++ b/drivers/slf4j/pom.xml
@@ -70,6 +70,11 @@
<version>1.7.2</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java
----------------------------------------------------------------------
diff --git a/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java b/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java
index e533496..dd43071 100644
--- a/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java
+++ b/drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java
@@ -20,9 +20,12 @@ import org.jclouds.logging.Logger.LoggerFactory;
import org.jclouds.logging.config.LoggingModule;
import org.jclouds.logging.slf4j.SLF4JLogger;
+import com.google.auto.service.AutoService;
+
/**
* Configures logging of type {@link SLF4JLogger}
*/
+@AutoService(LoggingModule.class)
public class SLF4JLoggingModule extends LoggingModule {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/drivers/slf4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
----------------------------------------------------------------------
diff --git a/drivers/slf4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule b/drivers/slf4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
deleted file mode 100644
index 1cbe65e..0000000
--- a/drivers/slf4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.logging.slf4j.config.SLF4JLoggingModule
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-cloudwatch/pom.xml
----------------------------------------------------------------------
diff --git a/providers/aws-cloudwatch/pom.xml b/providers/aws-cloudwatch/pom.xml
index a92b278..70afae6 100644
--- a/providers/aws-cloudwatch/pom.xml
+++ b/providers/aws-cloudwatch/pom.xml
@@ -71,6 +71,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java b/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java
index 797ee51..32b3d0a 100644
--- a/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java
+++ b/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java
@@ -26,11 +26,14 @@ import org.jclouds.cloudwatch.CloudWatchApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's CloudWatch
* provider.
*
*/
+@AutoService(ProviderMetadata.class)
public class AWSCloudWatchProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-cloudwatch/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/aws-cloudwatch/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-cloudwatch/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 553504a..0000000
--- a/providers/aws-cloudwatch/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.aws.cloudwatch.AWSCloudWatchProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-ec2/pom.xml
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/pom.xml b/providers/aws-ec2/pom.xml
index c15b190..6addf1b 100644
--- a/providers/aws-ec2/pom.xml
+++ b/providers/aws-ec2/pom.xml
@@ -113,6 +113,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
index da1f65c..d03ada7 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.jclouds.aws.ec2;
+
import static org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_AMI_QUERY;
import static org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_CC_AMI_QUERY;
import static org.jclouds.aws.ec2.reference.AWSEC2Constants.PROPERTY_EC2_CC_REGIONS;
@@ -28,10 +29,13 @@ import org.jclouds.aws.domain.Region;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@ link org.jclouds.types.ProviderMetadata} for Amazon's
* Elastic Compute Cloud (EC2) provider.
*/
+@AutoService(ProviderMetadata.class)
public class AWSEC2ProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 636b065..0000000
--- a/providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.aws.ec2.AWSEC2ProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-route53/pom.xml
----------------------------------------------------------------------
diff --git a/providers/aws-route53/pom.xml b/providers/aws-route53/pom.xml
index 2bb289d..9d6b293 100644
--- a/providers/aws-route53/pom.xml
+++ b/providers/aws-route53/pom.xml
@@ -71,6 +71,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java b/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java
index f187728..1eb812a 100644
--- a/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java
+++ b/providers/aws-route53/src/main/java/org/jclouds/aws/route53/AWSRoute53ProviderMetadata.java
@@ -23,11 +23,14 @@ import org.jclouds.route53.Route53ApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's Route53
* provider.
*
*/
+@AutoService(ProviderMetadata.class)
public class AWSRoute53ProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-route53/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/aws-route53/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-route53/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 4092771..0000000
--- a/providers/aws-route53/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.aws.route53.AWSRoute53ProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-s3/pom.xml
----------------------------------------------------------------------
diff --git a/providers/aws-s3/pom.xml b/providers/aws-s3/pom.xml
index c226c51..40581a5 100644
--- a/providers/aws-s3/pom.xml
+++ b/providers/aws-s3/pom.xml
@@ -122,6 +122,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
index 81480d3..899c3de 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
@@ -35,10 +35,13 @@ import org.jclouds.aws.domain.Region;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link org.jclouds.providers.ProviderMetadata} for Amazon's Simple Storage Service
* (S3) provider.
*/
+@AutoService(ProviderMetadata.class)
public class AWSS3ProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index be3179d..0000000
--- a/providers/aws-s3/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.aws.s3.AWSS3ProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-sqs/pom.xml
----------------------------------------------------------------------
diff --git a/providers/aws-sqs/pom.xml b/providers/aws-sqs/pom.xml
index 598444b..ea0420f 100644
--- a/providers/aws-sqs/pom.xml
+++ b/providers/aws-sqs/pom.xml
@@ -76,6 +76,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java b/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java
index f47e16f..9039d90 100644
--- a/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java
+++ b/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java
@@ -34,10 +34,13 @@ import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.sqs.SQSApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's Simple Queue Service
* provider.
*/
+@AutoService(ProviderMetadata.class)
public class AWSSQSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 6f797d6..0000000
--- a/providers/aws-sqs/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.aws.sqs.AWSSQSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-sts/pom.xml
----------------------------------------------------------------------
diff --git a/providers/aws-sts/pom.xml b/providers/aws-sts/pom.xml
index 71365ec..870bdc5 100644
--- a/providers/aws-sts/pom.xml
+++ b/providers/aws-sts/pom.xml
@@ -71,6 +71,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java b/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
index 5bca71d..26a0666 100644
--- a/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
+++ b/providers/aws-sts/src/main/java/org/jclouds/aws/sts/AWSSTSProviderMetadata.java
@@ -23,11 +23,14 @@ import org.jclouds.sts.STSApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of @ link org.jclouds.types.ProviderMetadata} for Amazon's STS
* provider.
*
*/
+@AutoService(ProviderMetadata.class)
public class AWSSTSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 3c3406f..0000000
--- a/providers/aws-sts/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.aws.sts.AWSSTSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/azureblob/pom.xml
----------------------------------------------------------------------
diff --git a/providers/azureblob/pom.xml b/providers/azureblob/pom.xml
index 52f155c..fa39b10 100644
--- a/providers/azureblob/pom.xml
+++ b/providers/azureblob/pom.xml
@@ -69,6 +69,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java
index 3d0a94d..348fc94 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java
@@ -22,9 +22,12 @@ import java.util.Properties;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link org.jclouds.types.ProviderMetadata} for Microsoft Azure Blob Service.
*/
+@AutoService(ProviderMetadata.class)
public class AzureBlobProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/azureblob/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/azureblob/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/azureblob/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index f5f5631..0000000
--- a/providers/azureblob/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.azureblob.AzureBlobProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/cloudfiles-uk/pom.xml
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/pom.xml b/providers/cloudfiles-uk/pom.xml
index 2828fa4..f8999f4 100644
--- a/providers/cloudfiles-uk/pom.xml
+++ b/providers/cloudfiles-uk/pom.xml
@@ -89,6 +89,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java b/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
index 096d3a5..4ceb23c 100644
--- a/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
+++ b/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.cloudfiles.CloudFilesApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Files UK.
+ * Implementation of {@link ProviderMetadata} for Rackspace Cloud Files UK.
*/
+@AutoService(ProviderMetadata.class)
public class CloudFilesUKProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/cloudfiles-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudfiles-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 2843a88..0000000
--- a/providers/cloudfiles-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudfiles.CloudFilesUKProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/cloudfiles-us/pom.xml
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/pom.xml b/providers/cloudfiles-us/pom.xml
index 46b216d..41341ef 100644
--- a/providers/cloudfiles-us/pom.xml
+++ b/providers/cloudfiles-us/pom.xml
@@ -90,6 +90,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
index fda686b..a8df816 100644
--- a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
+++ b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.cloudfiles.CloudFilesApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Rackspace Cloud Files US.
+ * Implementation of {@link ProviderMetadata} for Rackspace Cloud Files US.
*/
+@AutoService(ProviderMetadata.class)
public class CloudFilesUSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/cloudfiles-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/cloudfiles-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/cloudfiles-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 9dca819..0000000
--- a/providers/cloudfiles-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudfiles.CloudFilesUSProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/dynect/pom.xml
----------------------------------------------------------------------
diff --git a/providers/dynect/pom.xml b/providers/dynect/pom.xml
index 199b73f..1099f1e 100644
--- a/providers/dynect/pom.xml
+++ b/providers/dynect/pom.xml
@@ -75,6 +75,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java
index e42a349..ac1a86b 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/DynECTProviderMetadata.java
@@ -25,9 +25,12 @@ import java.util.Properties;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for DynECT Managed DNS.
+ * Implementation of {@link ProviderMetadata} for DynECT Managed DNS.
*/
+@AutoService(ProviderMetadata.class)
public class DynECTProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/dynect/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/dynect/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 10bc296..0000000
--- a/providers/dynect/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.dynect.v3.DynECTProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-ams-e/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-ams-e/pom.xml b/providers/elastichosts-ams-e/pom.xml
index 2cc261d..408dd99 100644
--- a/providers/elastichosts-ams-e/pom.xml
+++ b/providers/elastichosts-ams-e/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java b/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java
index 54cb2b3..7577d8d 100644
--- a/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java
+++ b/providers/elastichosts-ams-e/src/main/java/org/jclouds/elastichosts/ElasticHostsAmsterdamMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Amsterdam.
+ * Implementation of {@link ProviderMetadata} for ElasticHosts Amsterdam.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsAmsterdamMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-ams-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-ams-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-ams-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 508e627..0000000
--- a/providers/elastichosts-ams-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsAmsterdamMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-hkg-e/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-hkg-e/pom.xml b/providers/elastichosts-hkg-e/pom.xml
index 58f0c8c..fa74385 100644
--- a/providers/elastichosts-hkg-e/pom.xml
+++ b/providers/elastichosts-hkg-e/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java b/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java
index e4a4709..05e3ceb 100644
--- a/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java
+++ b/providers/elastichosts-hkg-e/src/main/java/org/jclouds/elastichosts/ElasticHostsHongKongProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Hong Kong.
+ * Implementation of {@link ProviderMetadata} for ElasticHosts Hong Kong.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsHongKongProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-hkg-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-hkg-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-hkg-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 067e3bb..0000000
--- a/providers/elastichosts-hkg-e/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsHongKongProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lax-p/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lax-p/pom.xml b/providers/elastichosts-lax-p/pom.xml
index 29333a7..e0c44e8 100644
--- a/providers/elastichosts-lax-p/pom.xml
+++ b/providers/elastichosts-lax-p/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java
index de51613..6e3abc6 100644
--- a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java
+++ b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java
@@ -25,10 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
-/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts LA Peer1.
+import com.google.auto.service.AutoService;
+/**
+ * Implementation of {@link ProviderMetadata} for ElasticHosts LA Peer1.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsPeer1LosAngelesProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lax-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lax-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-lax-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index f659bfa..0000000
--- a/providers/elastichosts-lax-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsPeer1LosAngelesProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lon-b/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lon-b/pom.xml b/providers/elastichosts-lon-b/pom.xml
index 0640522..6f52683 100644
--- a/providers/elastichosts-lon-b/pom.xml
+++ b/providers/elastichosts-lon-b/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java b/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java
index 47b80ba..9de3a3f 100644
--- a/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java
+++ b/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts London BlueSquare.
+ * Implementation of {@link ProviderMetadata} for ElasticHosts London BlueSquare.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsBlueSquareLondonProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lon-b/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lon-b/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-lon-b/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index b7305b8..0000000
--- a/providers/elastichosts-lon-b/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsBlueSquareLondonProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lon-p/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lon-p/pom.xml b/providers/elastichosts-lon-p/pom.xml
index 1783b79..db275a3 100644
--- a/providers/elastichosts-lon-p/pom.xml
+++ b/providers/elastichosts-lon-p/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java b/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java
index 4d428b1..799548b 100644
--- a/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java
+++ b/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts London Peer 1.
+ * Implementation of {@link ProviderMetadata} for ElasticHosts London Peer 1.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsPeer1LondonProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-lon-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-lon-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-lon-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 5f8edef..0000000
--- a/providers/elastichosts-lon-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsPeer1LondonProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-sat-p/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-sat-p/pom.xml b/providers/elastichosts-sat-p/pom.xml
index 70f2c7a..2a25002 100644
--- a/providers/elastichosts-sat-p/pom.xml
+++ b/providers/elastichosts-sat-p/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java b/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java
index dfa920c..1603c1c 100644
--- a/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java
+++ b/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts San Antonio Peer 1.
+ * Implementation of {@link ProviderMetadata} for ElasticHosts San Antonio Peer 1.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsPeer1SanAntonioProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-sat-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-sat-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-sat-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 7981420..0000000
--- a/providers/elastichosts-sat-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsPeer1SanAntonioProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-sjc-c/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-sjc-c/pom.xml b/providers/elastichosts-sjc-c/pom.xml
index 2a033df..72f2972 100644
--- a/providers/elastichosts-sjc-c/pom.xml
+++ b/providers/elastichosts-sjc-c/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java b/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java
index 4db8428..e4dc5f5 100644
--- a/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java
+++ b/providers/elastichosts-sjc-c/src/main/java/org/jclouds/elastichosts/ElasticHostsSanJoseProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts San Jose.
+ * Implementation of {@link ProviderMetadata} for ElasticHosts San Jose.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsSanJoseProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-sjc-c/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-sjc-c/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-sjc-c/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index e739bdd..0000000
--- a/providers/elastichosts-sjc-c/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsSanJoseProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-syd-v/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-syd-v/pom.xml b/providers/elastichosts-syd-v/pom.xml
index 822eea3..5ebf960 100644
--- a/providers/elastichosts-syd-v/pom.xml
+++ b/providers/elastichosts-syd-v/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java b/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java
index d05ba00..1c383fe 100644
--- a/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java
+++ b/providers/elastichosts-syd-v/src/main/java/org/jclouds/elastichosts/ElasticHostsSydneyProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Sydney.
+ * Implementation of {@link ProviderMetadata} for ElasticHosts Sydney.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsSydneyProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-syd-v/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-syd-v/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-syd-v/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 256bcdc..0000000
--- a/providers/elastichosts-syd-v/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsSydneyProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-tor-p/pom.xml
----------------------------------------------------------------------
diff --git a/providers/elastichosts-tor-p/pom.xml b/providers/elastichosts-tor-p/pom.xml
index 45959c0..6484592 100644
--- a/providers/elastichosts-tor-p/pom.xml
+++ b/providers/elastichosts-tor-p/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java
index 9f473cd..8056ff3 100644
--- a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java
+++ b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java
@@ -25,9 +25,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for ElasticHosts Toronto Peer 1.
+ * Implementation of {@link ProviderMetadata} for ElasticHosts Toronto Peer 1.
*/
+@AutoService(ProviderMetadata.class)
public class ElasticHostsPeer1TorontoProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/elastichosts-tor-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/elastichosts-tor-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/elastichosts-tor-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 4b12b32..0000000
--- a/providers/elastichosts-tor-p/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elastichosts.ElasticHostsPeer1TorontoProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/enterprisechef/pom.xml
----------------------------------------------------------------------
diff --git a/providers/enterprisechef/pom.xml b/providers/enterprisechef/pom.xml
index d256601..08f1c39 100644
--- a/providers/enterprisechef/pom.xml
+++ b/providers/enterprisechef/pom.xml
@@ -72,6 +72,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java b/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java
index d72cc78..cf77acc 100644
--- a/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java
+++ b/providers/enterprisechef/src/main/java/org/jclouds/enterprisechef/EnterpriseChefProviderMetadata.java
@@ -22,10 +22,12 @@ import java.util.Properties;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of @ link org.jclouds.types.ProviderMetadata} for Enterprise
- * Chef
+ * Implementation of @ link ProviderMetadata} for Enterprise Chef
*/
+@AutoService(ProviderMetadata.class)
public class EnterpriseChefProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/enterprisechef/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/enterprisechef/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/enterprisechef/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 7861cbb..0000000
--- a/providers/enterprisechef/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.enterprisechef.EnterpriseChefProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/glesys/pom.xml
----------------------------------------------------------------------
diff --git a/providers/glesys/pom.xml b/providers/glesys/pom.xml
index 0faf1e6..cb5efa5 100644
--- a/providers/glesys/pom.xml
+++ b/providers/glesys/pom.xml
@@ -74,7 +74,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java b/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java
index 56083e1..66015e1 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java
@@ -27,9 +27,12 @@ import java.util.Properties;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for GleSYS.
+ * Implementation of {@link ProviderMetadata} for GleSYS.
*/
+@AutoService(ProviderMetadata.class)
public class GleSYSProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 9d27436..0000000
--- a/providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.glesys.GleSYSProviderMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/go2cloud-jhb1/pom.xml
----------------------------------------------------------------------
diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml
index a3a6648..218505b 100644
--- a/providers/go2cloud-jhb1/pom.xml
+++ b/providers/go2cloud-jhb1/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java
index a85ce04..80df182 100644
--- a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java
+++ b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java
@@ -23,10 +23,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for Go2Cloud's Johannesburg1
- * provider.
+ * Implementation of {@link ProviderMetadata} for Go2Cloud's Johannesburg1 provider.
*/
+@AutoService(ProviderMetadata.class)
public class Go2CloudJohannesburg1ProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/go2cloud-jhb1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/go2cloud-jhb1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/go2cloud-jhb1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index d6a1432..0000000
--- a/providers/go2cloud-jhb1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.go2cloud.Go2CloudJohannesburg1ProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/gogrid/pom.xml
----------------------------------------------------------------------
diff --git a/providers/gogrid/pom.xml b/providers/gogrid/pom.xml
index 0f926dc..faebc3c 100644
--- a/providers/gogrid/pom.xml
+++ b/providers/gogrid/pom.xml
@@ -84,6 +84,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java
index 6f095a7..ef2b0aa 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java
@@ -27,9 +27,12 @@ import java.util.Properties;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for GoGrid.
+ * Implementation of {@link ProviderMetadata} for GoGrid.
*/
+@AutoService(ProviderMetadata.class)
public class GoGridProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/gogrid/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/gogrid/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 4aef048..0000000
--- a/providers/gogrid/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.gogrid.GoGridProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-blockstorage/pom.xml
----------------------------------------------------------------------
diff --git a/providers/hpcloud-blockstorage/pom.xml b/providers/hpcloud-blockstorage/pom.xml
index 49959f2..00f56df 100644
--- a/providers/hpcloud-blockstorage/pom.xml
+++ b/providers/hpcloud-blockstorage/pom.xml
@@ -95,6 +95,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java b/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java
index 5889d68..2a00440 100644
--- a/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java
+++ b/providers/hpcloud-blockstorage/src/main/java/org/jclouds/hpcloud/blockstorage/HPCloudBlockStorageProviderMetadata.java
@@ -29,10 +29,13 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.REQU
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud Block Storage service.
+ * Implementation of {@link ProviderMetadata} for HP Cloud Block Storage service.
*
*/
+@AutoService(ProviderMetadata.class)
public class HPCloudBlockStorageProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-blockstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/hpcloud-blockstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-blockstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 4312483..0000000
--- a/providers/hpcloud-blockstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.hpcloud.blockstorage.HPCloudBlockStorageProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-compute/pom.xml
----------------------------------------------------------------------
diff --git a/providers/hpcloud-compute/pom.xml b/providers/hpcloud-compute/pom.xml
index 175e839..bdbb8c5 100644
--- a/providers/hpcloud-compute/pom.xml
+++ b/providers/hpcloud-compute/pom.xml
@@ -100,6 +100,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
index 7fde453..320fb7e 100644
--- a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
+++ b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
@@ -37,12 +37,14 @@ import org.jclouds.openstack.nova.v2_0.config.NovaParserModule;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud Compute Services.
+ * Implementation of {@link ProviderMetadata} for HP Cloud Compute Services.
*/
+@AutoService(ProviderMetadata.class)
public class HPCloudComputeProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index c25bb18..0000000
--- a/providers/hpcloud-compute/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.hpcloud.compute.HPCloudComputeProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-objectstorage/pom.xml
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/pom.xml b/providers/hpcloud-objectstorage/pom.xml
index 58a35b7..200743e 100644
--- a/providers/hpcloud-objectstorage/pom.xml
+++ b/providers/hpcloud-objectstorage/pom.xml
@@ -100,6 +100,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java
index 415214e..6e7abbb 100644
--- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java
+++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java
@@ -26,9 +26,12 @@ import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for HP Cloud
+ * Implementation of {@link ProviderMetadata} for HP Cloud
*/
+@AutoService(ProviderMetadata.class)
public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/hpcloud-objectstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/hpcloud-objectstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index f937926..0000000
--- a/providers/hpcloud-objectstorage/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.hpcloud.objectstorage.HPCloudObjectStorageProviderMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/openhosting-east1/pom.xml
----------------------------------------------------------------------
diff --git a/providers/openhosting-east1/pom.xml b/providers/openhosting-east1/pom.xml
index 171d50b..fa1e5ae 100644
--- a/providers/openhosting-east1/pom.xml
+++ b/providers/openhosting-east1/pom.xml
@@ -87,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java
index de9493b..ff64317 100644
--- a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java
+++ b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java
@@ -23,9 +23,12 @@ import org.jclouds.elasticstack.ElasticStackApiMetadata;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
+import com.google.auto.service.AutoService;
+
/**
- * Implementation of {@link org.jclouds.types.ProviderMetadata} for OpenHosting East1.
+ * Implementation of {@link ProviderMetadata} for OpenHosting East1.
*/
+@AutoService(ProviderMetadata.class)
public class OpenHostingEast1ProviderMetadata extends BaseProviderMetadata {
public static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
----------------------------------------------------------------------
diff --git a/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
deleted file mode 100644
index 996483c..0000000
--- a/providers/openhosting-east1/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.openhosting.OpenHostingEast1ProviderMetadata
[3/3] jclouds git commit: Use AutoService to generate service loader
metadata
Posted by jd...@apache.org.
Use AutoService to generate service loader metadata
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d3c1e2ea
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d3c1e2ea
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d3c1e2ea
Branch: refs/heads/master
Commit: d3c1e2eab4bd71ecdf2ebfcd73e5d28c835398cd
Parents: d6d06b7
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Mon Dec 1 09:46:13 2014 -0800
Committer: Jeremy Daggett <jd...@apache.org>
Committed: Fri Jan 9 11:22:12 2015 -0800
----------------------------------------------------------------------
apis/atmos/pom.xml | 8 +++++++-
.../java/org/jclouds/atmos/AtmosApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/byon/pom.xml | 13 +++++++------
.../java/org/jclouds/byon/BYONApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/chef/pom.xml | 11 ++++++-----
.../java/org/jclouds/chef/ChefApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/cloudfiles/pom.xml | 5 +++++
.../jclouds/cloudfiles/CloudFilesApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/cloudstack/pom.xml | 14 ++++++++------
.../jclouds/cloudstack/CloudStackApiMetadata.java | 5 ++++-
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/cloudwatch/pom.xml | 5 +++++
.../jclouds/cloudwatch/CloudWatchApiMetadata.java | 4 ++++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/ec2/pom.xml | 14 ++++++++------
.../main/java/org/jclouds/ec2/EC2ApiMetadata.java | 2 ++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/elasticstack/pom.xml | 14 ++++++++------
.../elasticstack/ElasticStackApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/filesystem/pom.xml | 5 +++++
.../jclouds/filesystem/FilesystemApiMetadata.java | 4 ++++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/openstack-cinder/pom.xml | 11 ++++++-----
.../openstack/cinder/v1/CinderApiMetadata.java | 5 ++++-
.../services/org.jclouds.apis.ApiMetadata | 18 ------------------
apis/openstack-keystone/pom.xml | 13 +++++++------
.../keystone/v2_0/KeystoneApiMetadata.java | 5 ++++-
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/openstack-nova-ec2/pom.xml | 12 ++++++------
.../openstack/nova/ec2/NovaEC2ApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/openstack-nova/pom.xml | 12 ++++++------
.../openstack/nova/v2_0/NovaApiMetadata.java | 5 ++++-
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/openstack-swift/pom.xml | 5 +++++
.../openstack/swift/v1/SwiftApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 18 ------------------
apis/openstack-trove/pom.xml | 13 +++++++------
.../openstack/trove/v1/TroveApiMetadata.java | 5 ++++-
.../services/org.jclouds.apis.ApiMetadata | 18 ------------------
apis/rackspace-clouddns/pom.xml | 11 ++++++-----
.../clouddns/v1/CloudDNSApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/rackspace-cloudidentity/pom.xml | 11 ++++++-----
.../v2_0/CloudIdentityApiMetadata.java | 2 ++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/rackspace-cloudloadbalancers/pom.xml | 6 ++++++
.../v1/CloudLoadBalancersApiMetadata.java | 7 ++++++-
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/route53/pom.xml | 5 +++++
.../org/jclouds/route53/Route53ApiMetadata.java | 4 ++++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/s3/pom.xml | 5 +++++
.../main/java/org/jclouds/s3/S3ApiMetadata.java | 2 ++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/sqs/pom.xml | 5 +++++
.../main/java/org/jclouds/sqs/SQSApiMetadata.java | 3 +++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/sts/pom.xml | 5 +++++
.../main/java/org/jclouds/sts/STSApiMetadata.java | 4 ++++
.../services/org.jclouds.apis.ApiMetadata | 1 -
apis/swift/pom.xml | 5 +++++
.../jclouds/openstack/swift/SwiftApiMetadata.java | 5 ++++-
.../openstack/swift/SwiftKeystoneApiMetadata.java | 7 +++++--
.../services/org.jclouds.apis.ApiMetadata | 2 --
blobstore/pom.xml | 6 ++++++
.../jclouds/blobstore/TransientApiMetadata.java | 4 ++++
.../services/org.jclouds.apis.ApiMetadata | 1 -
compute/pom.xml | 5 +++++
.../org/jclouds/compute/stub/StubApiMetadata.java | 4 ++++
.../services/org.jclouds.apis.ApiMetadata | 1 -
core/pom.xml | 5 +++++
.../logging/jdk/config/JDKLoggingModule.java | 10 +++++++---
.../org.jclouds.logging.config.LoggingModule | 1 -
.../apis/JcloudsTestBlobStoreApiMetadata.java | 5 ++++-
.../apis/JcloudsTestComputeApiMetadata.java | 5 ++++-
.../JcloudsTestYetAnotherComputeApiMetadata.java | 5 ++++-
.../JcloudsTestBlobStoreProviderMetadata.java | 6 ++++--
.../JcloudsTestComputeProviderMetadata.java | 6 ++++--
...oudsTestYetAnotherComputeProviderMetadata.java | 8 +++++---
.../services/org.jclouds.apis.ApiMetadata | 3 ---
.../org.jclouds.providers.ProviderMetadata | 3 ---
drivers/log4j/pom.xml | 6 +++++-
.../logging/log4j/config/Log4JLoggingModule.java | 3 +++
.../org.jclouds.logging.config.LoggingModule | 1 -
drivers/slf4j/pom.xml | 5 +++++
.../logging/slf4j/config/SLF4JLoggingModule.java | 3 +++
.../org.jclouds.logging.config.LoggingModule | 1 -
providers/aws-cloudwatch/pom.xml | 5 +++++
.../cloudwatch/AWSCloudWatchProviderMetadata.java | 3 +++
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/aws-ec2/pom.xml | 5 +++++
.../jclouds/aws/ec2/AWSEC2ProviderMetadata.java | 4 ++++
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/aws-route53/pom.xml | 5 +++++
.../aws/route53/AWSRoute53ProviderMetadata.java | 3 +++
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/aws-s3/pom.xml | 5 +++++
.../org/jclouds/aws/s3/AWSS3ProviderMetadata.java | 3 +++
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/aws-sqs/pom.xml | 5 +++++
.../jclouds/aws/sqs/AWSSQSProviderMetadata.java | 3 +++
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/aws-sts/pom.xml | 5 +++++
.../jclouds/aws/sts/AWSSTSProviderMetadata.java | 3 +++
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/azureblob/pom.xml | 5 +++++
.../azureblob/AzureBlobProviderMetadata.java | 3 +++
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/cloudfiles-uk/pom.xml | 5 +++++
.../cloudfiles/CloudFilesUKProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/cloudfiles-us/pom.xml | 5 +++++
.../cloudfiles/CloudFilesUSProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/dynect/pom.xml | 5 +++++
.../jclouds/dynect/v3/DynECTProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-ams-e/pom.xml | 5 +++++
.../ElasticHostsAmsterdamMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-hkg-e/pom.xml | 5 +++++
.../ElasticHostsHongKongProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-lax-p/pom.xml | 5 +++++
...asticHostsPeer1LosAngelesProviderMetadata.java | 6 ++++--
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-lon-b/pom.xml | 5 +++++
...sticHostsBlueSquareLondonProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-lon-p/pom.xml | 5 +++++
.../ElasticHostsPeer1LondonProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-sat-p/pom.xml | 5 +++++
...asticHostsPeer1SanAntonioProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-sjc-c/pom.xml | 5 +++++
.../ElasticHostsSanJoseProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-syd-v/pom.xml | 5 +++++
.../ElasticHostsSydneyProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/elastichosts-tor-p/pom.xml | 5 +++++
.../ElasticHostsPeer1TorontoProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/enterprisechef/pom.xml | 5 +++++
.../EnterpriseChefProviderMetadata.java | 6 ++++--
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/glesys/pom.xml | 6 ++++++
.../jclouds/glesys/GleSYSProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/go2cloud-jhb1/pom.xml | 5 +++++
.../Go2CloudJohannesburg1ProviderMetadata.java | 6 ++++--
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/gogrid/pom.xml | 5 +++++
.../jclouds/gogrid/GoGridProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/hpcloud-blockstorage/pom.xml | 5 +++++
.../HPCloudBlockStorageProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/hpcloud-compute/pom.xml | 5 +++++
.../compute/HPCloudComputeProviderMetadata.java | 4 +++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/hpcloud-objectstorage/pom.xml | 5 +++++
.../HPCloudObjectStorageProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/openhosting-east1/pom.xml | 5 +++++
.../OpenHostingEast1ProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-cloudblockstorage-uk/pom.xml | 12 ++++++------
.../uk/CloudBlockStorageUKProviderMetadata.java | 4 +++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-cloudblockstorage-us/pom.xml | 12 ++++++------
.../us/CloudBlockStorageUSProviderMetadata.java | 4 +++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-clouddatabases-uk/pom.xml | 12 ++++++------
.../uk/CloudDatabasesUKProviderMetadata.java | 4 +++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-clouddatabases-us/pom.xml | 12 ++++++------
.../us/CloudDatabasesUSProviderMetadata.java | 4 +++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-clouddns-uk/pom.xml | 12 ++++++------
.../clouddns/uk/CloudDNSUKProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-clouddns-us/pom.xml | 12 ++++++------
.../clouddns/us/CloudDNSUSProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-cloudloadbalancers-uk/pom.xml | 5 +++++
.../uk/CloudLoadBalancersUKProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-cloudloadbalancers-us/pom.xml | 5 +++++
.../us/CloudLoadBalancersUSProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-cloudservers-uk/pom.xml | 12 ++++++------
.../uk/CloudServersUKProviderMetadata.java | 4 +++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/rackspace-cloudservers-us/pom.xml | 12 ++++++------
.../us/CloudServersUSProviderMetadata.java | 4 +++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/serverlove-z1-man/pom.xml | 5 +++++
.../ServerloveManchesterProviderMetadata.java | 4 +++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/skalicloud-sdg-my/pom.xml | 5 +++++
.../SkaliCloudMalaysiaProviderMetadata.java | 5 ++++-
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/softlayer/pom.xml | 6 ++++++
.../softlayer/SoftLayerProviderMetadata.java | 17 ++++++++++-------
.../org.jclouds.providers.ProviderMetadata | 1 -
providers/ultradns-ws/pom.xml | 5 +++++
.../ultradns/ws/UltraDNSWSProviderMetadata.java | 6 ++++--
.../org.jclouds.providers.ProviderMetadata | 1 -
skeletons/standalone-compute/pom.xml | 5 +++++
.../servermanager/ServerManagerApiMetadata.java | 4 ++++
.../services/org.jclouds.apis.ApiMetadata | 1 -
219 files changed, 675 insertions(+), 312 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/atmos/pom.xml
----------------------------------------------------------------------
diff --git a/apis/atmos/pom.xml b/apis/atmos/pom.xml
index 57ee14e..0201601 100644
--- a/apis/atmos/pom.xml
+++ b/apis/atmos/pom.xml
@@ -38,8 +38,8 @@
<test.atmos.identity>FIXME_IDENTITY</test.atmos.identity>
<test.atmos.credential>FIXME_CREDENTIAL</test.atmos.credential>
- <jclouds.osgi.import>*</jclouds.osgi.import>
<jclouds.osgi.export>org.jclouds.atmos*;version="${project.version}";-noimport:=true</jclouds.osgi.export>
+ <jclouds.osgi.import>*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -73,7 +73,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
index ab7757a..4b4d2a6 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
@@ -23,14 +23,17 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.atmos.blobstore.config.AtmosBlobStoreContextModule;
import org.jclouds.atmos.config.AtmosHttpApiModule;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+@AutoService(ApiMetadata.class)
public class AtmosApiMetadata extends BaseHttpApiMetadata {
private static Builder builder() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/atmos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/atmos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 3cc1141..0000000
--- a/apis/atmos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.atmos.AtmosApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/byon/pom.xml
----------------------------------------------------------------------
diff --git a/apis/byon/pom.xml b/apis/byon/pom.xml
index 02100a9..6a46eb1 100644
--- a/apis/byon/pom.xml
+++ b/apis/byon/pom.xml
@@ -35,13 +35,9 @@
<test.byon.endpoint>file://c:/test.txt</test.byon.endpoint>
<test.byon.sudo-password />
<jclouds.osgi.export>org.jclouds.byon*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.jclouds</groupId>
@@ -79,6 +75,11 @@
<artifactId>snakeyaml</artifactId>
<version>1.11</version>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java b/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
index 8f188e3..efe9330 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
@@ -19,11 +19,13 @@ package org.jclouds.byon;
import java.net.URI;
import org.jclouds.JcloudsVersion;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.internal.BaseApiMetadata;
import org.jclouds.byon.config.BYONComputeServiceContextModule;
import org.jclouds.byon.config.YamlNodeStoreModule;
import org.jclouds.compute.ComputeServiceContext;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
@@ -35,6 +37,7 @@ import com.google.inject.Module;
* This class is not setup to allow a subclasses to override the type of api,
* asyncapi, or context. This is an optimization for s.
*/
+@AutoService(ApiMetadata.class)
public class BYONApiMetadata extends BaseApiMetadata {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/byon/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/byon/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/byon/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 2816908..0000000
--- a/apis/byon/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.byon.BYONApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/chef/pom.xml
----------------------------------------------------------------------
diff --git a/apis/chef/pom.xml b/apis/chef/pom.xml
index 865d30a..178128f 100644
--- a/apis/chef/pom.xml
+++ b/apis/chef/pom.xml
@@ -37,15 +37,11 @@
<test.chef.build-version />
<test.chef.identity>chef-webui</test.chef.identity>
<test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential>
- <jclouds.osgi.import>
- org.jclouds;version=${project.version},
- org.jclouds*;version=${project.version},
- *
- </jclouds.osgi.import>
<jclouds.osgi.export>
org.jclouds.chef*;version=${project.version};-noimport:=true,
org.jclouds.ohai*;version=${project.version};-noimport:=true,
</jclouds.osgi.export>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -98,6 +94,11 @@
<version>1.0.9</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java b/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
index ede03e9..d983a98 100644
--- a/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
+++ b/apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
@@ -28,18 +28,21 @@ import static org.jclouds.chef.config.ChefProperties.CHEF_USE_OMNIBUS;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.chef.config.ChefBootstrapModule;
import org.jclouds.chef.config.ChefHttpApiModule;
import org.jclouds.chef.config.ChefParserModule;
import org.jclouds.ohai.config.JMXOhaiModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
* Implementation of {@link ApiMetadata} for OpsCode's Chef api.
*/
+@AutoService(ApiMetadata.class)
public class ChefApiMetadata extends BaseHttpApiMetadata<ChefApi> {
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index c7a6f4e..0000000
--- a/apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.chef.ChefApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudfiles/pom.xml
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/pom.xml b/apis/cloudfiles/pom.xml
index 0b698eb..97c04b6 100644
--- a/apis/cloudfiles/pom.xml
+++ b/apis/cloudfiles/pom.xml
@@ -91,6 +91,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
index 1c81946..7d4de81 100644
--- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
+++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
@@ -19,6 +19,7 @@ package org.jclouds.cloudfiles;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.blobstore.BlobRequestSigner;
import org.jclouds.cloudfiles.blobstore.config.CloudFilesBlobStoreContextModule;
import org.jclouds.cloudfiles.config.CloudFilesHttpApiModule;
@@ -27,10 +28,12 @@ import org.jclouds.openstack.swift.SwiftApiMetadata;
import org.jclouds.openstack.swift.blobstore.SwiftBlobSigner;
import org.jclouds.openstack.swift.blobstore.config.TemporaryUrlExtensionModule;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
import com.google.inject.TypeLiteral;
+@AutoService(ApiMetadata.class)
public class CloudFilesApiMetadata extends SwiftApiMetadata {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudfiles/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/cloudfiles/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/cloudfiles/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 4ae7611..0000000
--- a/apis/cloudfiles/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.cloudfiles.CloudFilesApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudstack/pom.xml
----------------------------------------------------------------------
diff --git a/apis/cloudstack/pom.xml b/apis/cloudstack/pom.xml
index 4b9d332..9b984b0 100644
--- a/apis/cloudstack/pom.xml
+++ b/apis/cloudstack/pom.xml
@@ -57,13 +57,9 @@
<test.cloudstack.globalAdminCredential />
<test.cloudstack.template>osFamily=CENTOS</test.cloudstack.template>
<jclouds.osgi.export>org.jclouds.cloudstack*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.jclouds</groupId>
@@ -106,7 +102,13 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
index 56dc772..840e869 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
@@ -21,16 +21,19 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.cloudstack.compute.config.CloudStackComputeServiceContextModule;
-import org.jclouds.cloudstack.config.CloudStackParserModule;
import org.jclouds.cloudstack.config.CloudStackHttpApiModule;
+import org.jclouds.cloudstack.config.CloudStackParserModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
* Implementation of {@link ApiMetadata} for Citrix/Apache CloudStack api.
*/
+@AutoService(ApiMetadata.class)
public class CloudStackApiMetadata extends BaseHttpApiMetadata<CloudStackApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/cloudstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index ad45dce..0000000
--- a/apis/cloudstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.cloudstack.CloudStackApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudwatch/pom.xml
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/pom.xml b/apis/cloudwatch/pom.xml
index fed4f1d..2291113 100644
--- a/apis/cloudwatch/pom.xml
+++ b/apis/cloudwatch/pom.xml
@@ -67,6 +67,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
index c1cfe43..fc63417 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
@@ -22,12 +22,16 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.cloudwatch.config.CloudWatchHttpApiModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link ApiMetadata} for Amazon's CloudWatch api.
*/
+@AutoService(ApiMetadata.class)
public class CloudWatchApiMetadata extends BaseHttpApiMetadata {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/cloudwatch/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/cloudwatch/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index de872be..0000000
--- a/apis/cloudwatch/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.cloudwatch.CloudWatchApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/ec2/pom.xml
----------------------------------------------------------------------
diff --git a/apis/ec2/pom.xml b/apis/ec2/pom.xml
index 4fe3493..4ca4321 100644
--- a/apis/ec2/pom.xml
+++ b/apis/ec2/pom.xml
@@ -44,12 +44,7 @@
<!-- Windows_Server-2008-R2 with WinRM enabled (setup instructions at http://www.frontiertown.co.uk/2011/12/overthere-control-windows-from-java/) -->
<test.ec2.windows-template>hardwareId=m1.small,imageId=us-east-1/ami-0cb76d65</test.ec2.windows-template>
<jclouds.osgi.export>org.jclouds.ec2*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -103,7 +98,13 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -112,6 +113,7 @@
</plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java b/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
index 2b081c5..fc227ca 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
@@ -34,9 +34,11 @@ import org.jclouds.ec2.compute.config.EC2ResolveImagesModule;
import org.jclouds.ec2.config.EC2HttpApiModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+@AutoService(ApiMetadata.class)
public final class EC2ApiMetadata extends BaseHttpApiMetadata<EC2Api> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index dce15a1..0000000
--- a/apis/ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.ec2.EC2ApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/elasticstack/pom.xml
----------------------------------------------------------------------
diff --git a/apis/elasticstack/pom.xml b/apis/elasticstack/pom.xml
index eb30bab..47dde1f 100644
--- a/apis/elasticstack/pom.xml
+++ b/apis/elasticstack/pom.xml
@@ -39,13 +39,9 @@
<test.elasticstack.credential>FIXME_CREDENTIAL</test.elasticstack.credential>
<test.elasticstack.template>imageId=38df0986-4d85-4b76-b502-3878ffc80161,loginUser=toor</test.elasticstack.template>
<jclouds.osgi.export>org.jclouds.elasticstack*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.jclouds</groupId>
@@ -90,7 +86,13 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
index 88495f0..d336a93 100644
--- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
+++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
@@ -22,17 +22,20 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.elasticstack.compute.config.ElasticStackComputeServiceContextModule;
import org.jclouds.elasticstack.config.ElasticStackHttpApiModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
* Implementation of {@link ApiMetadata} for the ElasticStack API
*/
+@AutoService(ApiMetadata.class)
public class ElasticStackApiMetadata extends BaseHttpApiMetadata<ElasticStackApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 562d329..0000000
--- a/apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.elasticstack.ElasticStackApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/filesystem/pom.xml
----------------------------------------------------------------------
diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml
index 2849d2c..2926e5b 100644
--- a/apis/filesystem/pom.xml
+++ b/apis/filesystem/pom.xml
@@ -66,6 +66,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java
index 4b71d0a..d4a3b64 100644
--- a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java
+++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java
@@ -18,13 +18,17 @@ package org.jclouds.filesystem;
import java.net.URI;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.internal.BaseApiMetadata;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.filesystem.config.FilesystemBlobStoreContextModule;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link ApiMetadata} for jclouds Filesystem-based BlobStore
*/
+@AutoService(ApiMetadata.class)
public class FilesystemApiMetadata extends BaseApiMetadata {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/filesystem/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/filesystem/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/filesystem/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 9219cb2..0000000
--- a/apis/filesystem/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.filesystem.FilesystemApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-cinder/pom.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/pom.xml b/apis/openstack-cinder/pom.xml
index 019bd1d..4c6392d 100644
--- a/apis/openstack-cinder/pom.xml
+++ b/apis/openstack-cinder/pom.xml
@@ -42,11 +42,7 @@
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
<jclouds.osgi.export>org.jclouds.openstack.cinder.v1*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -85,6 +81,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
index e532f37..fc9ac76 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
@@ -22,6 +22,7 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.openstack.cinder.v1.config.CinderHttpApiModule;
import org.jclouds.openstack.cinder.v1.config.CinderParserModule;
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
@@ -31,12 +32,14 @@ import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.R
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.apis.ApiMetadata} for Cinder v1 API
+ * Implementation of {@link ApiMetadata} for Cinder v1 API
*/
+@AutoService(ApiMetadata.class)
public class CinderApiMetadata extends BaseHttpApiMetadata<CinderApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 083e7f7..0000000
--- a/apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jclouds.openstack.cinder.v1.CinderApiMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-keystone/pom.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/pom.xml b/apis/openstack-keystone/pom.xml
index 4316871..27881d7 100644
--- a/apis/openstack-keystone/pom.xml
+++ b/apis/openstack-keystone/pom.xml
@@ -42,11 +42,7 @@
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
<jclouds.osgi.export>org.jclouds.openstack*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -78,8 +74,13 @@
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
index 0c76a58..a06ea13 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
@@ -22,6 +22,7 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
@@ -31,12 +32,14 @@ import org.jclouds.openstack.keystone.v2_0.config.KeystoneParserModule;
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.apis.ApiMetadata} for Keystone 2.0 API
+ * Implementation of {@link ApiMetadata} for Keystone 2.0 API
*/
+@AutoService(ApiMetadata.class)
public class KeystoneApiMetadata extends BaseHttpApiMetadata<KeystoneApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-keystone/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-keystone/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 72609ba..0000000
--- a/apis/openstack-keystone/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.openstack.keystone.v2_0.KeystoneApiMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-nova-ec2/pom.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-nova-ec2/pom.xml b/apis/openstack-nova-ec2/pom.xml
index 57c1615..d3c43c5 100644
--- a/apis/openstack-nova-ec2/pom.xml
+++ b/apis/openstack-nova-ec2/pom.xml
@@ -40,12 +40,7 @@
<test.openstack-nova-ec2.template />
<test.openstack-nova-ec2.ebs-template />
<jclouds.osgi.export>org.jclouds.openstack.nova.ec2*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -92,6 +87,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java
index 1180fcf..e173acf 100644
--- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java
+++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java
@@ -26,6 +26,7 @@ import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.ec2.EC2ApiMetadata;
import org.jclouds.ec2.compute.EC2ComputeServiceContext;
import org.jclouds.ec2.compute.config.EC2ResolveImagesModule;
@@ -34,9 +35,11 @@ import org.jclouds.openstack.nova.ec2.config.NovaEC2ComputeServiceContextModule;
import org.jclouds.openstack.nova.ec2.config.NovaEC2HttpApiModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+@AutoService(ApiMetadata.class)
public final class NovaEC2ApiMetadata extends BaseHttpApiMetadata<NovaEC2Api> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-nova-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/openstack-nova-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-nova-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index f77b757..0000000
--- a/apis/openstack-nova-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.openstack.nova.ec2.NovaEC2ApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-nova/pom.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/pom.xml b/apis/openstack-nova/pom.xml
index 1a3de0e..cc08146 100644
--- a/apis/openstack-nova/pom.xml
+++ b/apis/openstack-nova/pom.xml
@@ -44,12 +44,7 @@
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
<jclouds.osgi.export>org.jclouds.openstack.nova.v2_0*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.compute.internal;version="${project.version}",
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -113,6 +108,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
index be37fe7..d73a1da 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
@@ -27,6 +27,7 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
@@ -38,12 +39,14 @@ import org.jclouds.openstack.nova.v2_0.config.NovaParserModule;
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.apis.ApiMetadata} for Nova 2.0 API
+ * Implementation of {@link ApiMetadata} for Nova 2.0 API
*/
+@AutoService(ApiMetadata.class)
public class NovaApiMetadata extends BaseHttpApiMetadata<NovaApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-nova/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-nova/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 67c3d34..0000000
--- a/apis/openstack-nova/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.openstack.nova.v2_0.NovaApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-swift/pom.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/pom.xml b/apis/openstack-swift/pom.xml
index 23333c1..6e50671 100644
--- a/apis/openstack-swift/pom.xml
+++ b/apis/openstack-swift/pom.xml
@@ -101,6 +101,11 @@
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
index 478bd81..3e0efd2 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
@@ -23,6 +23,7 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
import org.jclouds.openstack.swift.v1.blobstore.RegionScopedBlobStoreContext;
@@ -34,9 +35,11 @@ import org.jclouds.openstack.swift.v1.config.SwiftTypeAdapters;
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+@AutoService(ApiMetadata.class)
public class SwiftApiMetadata extends BaseHttpApiMetadata<SwiftApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index c5b8017..0000000
--- a/apis/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jclouds.openstack.swift.v1.SwiftApiMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-trove/pom.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/pom.xml b/apis/openstack-trove/pom.xml
index 17f8406..20848ca 100644
--- a/apis/openstack-trove/pom.xml
+++ b/apis/openstack-trove/pom.xml
@@ -40,13 +40,9 @@
<test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
<jclouds.osgi.export>org.jclouds.openstack.trove.v1_0*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.rest.internal;version="${jclouds.version}",
- org.jclouds.labs*;version="${project.version}",
- org.jclouds*;version="${jclouds.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
@@ -83,6 +79,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java
index c40d941..3d5e469 100644
--- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java
+++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java
@@ -22,6 +22,7 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
@@ -31,12 +32,14 @@ import org.jclouds.openstack.trove.v1.config.TroveParserModule;
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
- * Implementation of {@link org.jclouds.apis.ApiMetadata} for the OpenStack Trove v1 API.
+ * Implementation of {@link ApiMetadata} for the OpenStack Trove v1 API.
*/
+@AutoService(ApiMetadata.class)
public class TroveApiMetadata extends BaseHttpApiMetadata<TroveApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/openstack-trove/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/openstack-trove/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 558658c..0000000
--- a/apis/openstack-trove/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.jclouds.openstack.trove.v1.TroveApiMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-clouddns/pom.xml
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/pom.xml b/apis/rackspace-clouddns/pom.xml
index 161cf6f..dae75d2 100644
--- a/apis/rackspace-clouddns/pom.xml
+++ b/apis/rackspace-clouddns/pom.xml
@@ -39,11 +39,7 @@
<test.rackspace-clouddns.credential>${test.rackspace-us.credential}</test.rackspace-clouddns.credential>
<jclouds.osgi.export>org.jclouds.rackspace.clouddns.v1*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -113,6 +109,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java
index 158f3c6..55ea21d 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java
@@ -24,18 +24,21 @@ import static org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCrede
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ProviderModule;
import org.jclouds.rackspace.clouddns.v1.config.CloudDNSHttpApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationApiModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
* Implementation of {@link ApiMetadata} for Rackspace Cloud DNS 1.0 API
*/
+@AutoService(ApiMetadata.class)
public class CloudDNSApiMetadata extends BaseHttpApiMetadata<CloudDNSApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index eae6b81..0000000
--- a/apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.clouddns.v1.CloudDNSApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-cloudidentity/pom.xml
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/pom.xml b/apis/rackspace-cloudidentity/pom.xml
index 24600c4..8eb7198 100644
--- a/apis/rackspace-cloudidentity/pom.xml
+++ b/apis/rackspace-cloudidentity/pom.xml
@@ -42,11 +42,7 @@
<test.jclouds.keystone.credential-type>RAX-KSKEY:apiKeyCredentials</test.jclouds.keystone.credential-type>
<jclouds.osgi.export>org.jclouds.rackspace.cloudidentity.v2_0*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>
- org.jclouds.rest.internal;version="${project.version}",
- org.jclouds*;version="${project.version}",
- *
- </jclouds.osgi.import>
+ <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
<dependencies>
@@ -80,6 +76,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
index d505cb8..3636a6c 100644
--- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
+++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
@@ -30,12 +30,14 @@ import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticati
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
* Implementation of {@link ApiMetadata} for the Rackspace Cloud Identity Service
*/
+@AutoService(ApiMetadata.class)
public class CloudIdentityApiMetadata extends KeystoneApiMetadata {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 37e56b6..0000000
--- a/apis/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityApiMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-cloudloadbalancers/pom.xml
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/pom.xml b/apis/rackspace-cloudloadbalancers/pom.xml
index c117e80..89bc663 100644
--- a/apis/rackspace-cloudloadbalancers/pom.xml
+++ b/apis/rackspace-cloudloadbalancers/pom.xml
@@ -96,7 +96,13 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
<profiles>
<profile>
<id>live</id>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
index 16cc2e7..67e0795 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.jclouds.rackspace.cloudloadbalancers.v1;
+
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
import static org.jclouds.reflect.Reflection2.typeToken;
@@ -22,6 +23,7 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.loadbalancer.LoadBalancerServiceContext;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
@@ -32,11 +34,14 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.config.CloudLoadBalancersHttp
import org.jclouds.rackspace.cloudloadbalancers.v1.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+
/**
- * Implementation of {@link org.jclouds.apis.ApiMetadata} for the Rackspace Cloud Load Balancers v1.0 API.
+ * Implementation of {@link ApiMetadata} for the Rackspace Cloud Load Balancers v1.0 API.
*/
+@AutoService(ApiMetadata.class)
public class CloudLoadBalancersApiMetadata extends BaseHttpApiMetadata<CloudLoadBalancersApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 4364b84..0000000
--- a/apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/route53/pom.xml
----------------------------------------------------------------------
diff --git a/apis/route53/pom.xml b/apis/route53/pom.xml
index 89a889b..1caeee2 100644
--- a/apis/route53/pom.xml
+++ b/apis/route53/pom.xml
@@ -67,6 +67,11 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java b/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java
index a43bdb7..385189b 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java
@@ -22,12 +22,16 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
import org.jclouds.route53.config.Route53HttpApiModule;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link ApiMetadata} for Amazon's Route53 api.
*/
+@AutoService(ApiMetadata.class)
public class Route53ApiMetadata extends BaseHttpApiMetadata<Route53Api> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/route53/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/route53/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index d9372d5..0000000
--- a/apis/route53/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.route53.Route53ApiMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/s3/pom.xml
----------------------------------------------------------------------
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index 14ea076..ad124b6 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -96,6 +96,11 @@
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
index a35928f..d124fd8 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
@@ -35,6 +35,7 @@ import org.jclouds.s3.blobstore.config.S3BlobStoreContextModule;
import org.jclouds.s3.config.S3HttpApiModule;
import org.jclouds.s3.reference.S3Headers;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
@@ -52,6 +53,7 @@ import com.google.inject.Module;
* not present in the base api. For example, you could make a subtype for
* context, that exposes admin operations.
*/
+@AutoService(ApiMetadata.class)
public class S3ApiMetadata extends BaseHttpApiMetadata {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/s3/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/s3/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index e206c63..0000000
--- a/apis/s3/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.s3.S3ApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/sqs/pom.xml
----------------------------------------------------------------------
diff --git a/apis/sqs/pom.xml b/apis/sqs/pom.xml
index 2a19b1e..acdf8d3 100644
--- a/apis/sqs/pom.xml
+++ b/apis/sqs/pom.xml
@@ -61,6 +61,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java
index c57fee1..9db46bc 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java
@@ -24,15 +24,18 @@ import static org.jclouds.sqs.config.SQSProperties.CREATE_QUEUE_RETRY_INTERVAL;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
import org.jclouds.sqs.config.SQSHttpApiModule;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
/**
* Implementation of {@link ApiMetadata} for Amazon's Simple Queue Service api.
*/
+@AutoService(ApiMetadata.class)
public class SQSApiMetadata extends BaseHttpApiMetadata {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 8831fe1..0000000
--- a/apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.sqs.SQSApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/sts/pom.xml
----------------------------------------------------------------------
diff --git a/apis/sts/pom.xml b/apis/sts/pom.xml
index ec6819e..bd44b11 100644
--- a/apis/sts/pom.xml
+++ b/apis/sts/pom.xml
@@ -67,6 +67,11 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java b/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
index 18e0ec8..43ef877 100644
--- a/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
@@ -22,12 +22,16 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
import org.jclouds.sts.config.STSHttpApiModule;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link ApiMetadata} for Amazon's STS api.
*/
+@AutoService(ApiMetadata.class)
public class STSApiMetadata extends BaseHttpApiMetadata<STSApi> {
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index df7b5d8..0000000
--- a/apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1 +0,0 @@
-org.jclouds.sts.STSApiMetadata
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/swift/pom.xml
----------------------------------------------------------------------
diff --git a/apis/swift/pom.xml b/apis/swift/pom.xml
index b05f0b2..edf408f 100644
--- a/apis/swift/pom.xml
+++ b/apis/swift/pom.xml
@@ -113,6 +113,11 @@
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
index ddafc79..bf059be 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
@@ -24,6 +24,7 @@ import static org.jclouds.reflect.Reflection2.typeToken;
import java.net.URI;
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule;
import org.jclouds.openstack.swift.blobstore.config.TemporaryUrlExtensionModule.SwiftTemporaryUrlExtensionModule;
@@ -31,9 +32,11 @@ import org.jclouds.openstack.swift.config.SwiftHttpApiModule;
import org.jclouds.openstack.swift.config.SwiftHttpApiModule.StorageEndpointModule;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+@AutoService(ApiMetadata.class)
public class SwiftApiMetadata extends BaseHttpApiMetadata {
@Override
@@ -89,7 +92,7 @@ public class SwiftApiMetadata extends BaseHttpApiMetadata {
return new SwiftApiMetadata(this);
}
}
-
+
private static class ConcreteBuilder extends Builder<SwiftClient, ConcreteBuilder> {
@Override
protected ConcreteBuilder self() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
index 35049df..9c1a204 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
@@ -23,18 +23,21 @@ import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERV
import java.util.Properties;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
import org.jclouds.openstack.services.ServiceType;
import org.jclouds.openstack.swift.blobstore.config.SwiftBlobStoreContextModule;
import org.jclouds.openstack.swift.blobstore.config.TemporaryUrlExtensionModule.SwiftKeystoneTemporaryUrlExtensionModule;
-import org.jclouds.openstack.swift.config.SwiftKeystoneHttpApiModule;
import org.jclouds.openstack.swift.config.SwiftHttpApiModule.KeystoneStorageEndpointModule;
+import org.jclouds.openstack.swift.config.SwiftKeystoneHttpApiModule;
+import com.google.auto.service.AutoService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
+@AutoService(ApiMetadata.class)
public class SwiftKeystoneApiMetadata extends SwiftApiMetadata {
@Override
@@ -89,7 +92,7 @@ public class SwiftKeystoneApiMetadata extends SwiftApiMetadata {
return new SwiftKeystoneApiMetadata(this);
}
}
-
+
private static class ConcreteBuilder extends Builder<SwiftKeystoneClient, ConcreteBuilder> {
@Override
protected ConcreteBuilder self() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/apis/swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git a/apis/swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/apis/swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 2abea61..0000000
--- a/apis/swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1,2 +0,0 @@
-org.jclouds.openstack.swift.SwiftApiMetadata
-org.jclouds.openstack.swift.SwiftKeystoneApiMetadata
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/blobstore/pom.xml
----------------------------------------------------------------------
diff --git a/blobstore/pom.xml b/blobstore/pom.xml
index 4789125..f1175ec 100644
--- a/blobstore/pom.xml
+++ b/blobstore/pom.xml
@@ -58,7 +58,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3c1e2ea/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java
index 88e13bb..deaa4a5 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java
@@ -18,12 +18,16 @@ package org.jclouds.blobstore;
import java.net.URI;
+import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.internal.BaseApiMetadata;
import org.jclouds.blobstore.config.TransientBlobStoreContextModule;
+import com.google.auto.service.AutoService;
+
/**
* Implementation of {@link ApiMetadata} for jclouds in-memory (Transient) API
*/
+@AutoService(ApiMetadata.class)
public class TransientApiMetadata extends BaseApiMetadata {
public static Builder builder() {