Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use AutoService to generate service loader metadata

This commit is contained in:
Jeremy Daggett 2014-12-01 09:46:13 -08:00 committed by Jeremy Daggett
parent d6d06b71f4
commit d3c1e2eab4
219 changed files with 675 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apis/atmos/pom.xml
View File

@ -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>

3
apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
View File

@ -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() {

1
apis/atmos/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.atmos.AtmosApiMetadata

13
apis/byon/pom.xml
View File

@ -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>

3
apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
View File

@ -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

1
apis/byon/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.byon.BYONApiMetadata

11
apis/chef/pom.xml
View File

@ -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>

3
apis/chef/src/main/java/org/jclouds/chef/ChefApiMetadata.java
View File

@ -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> {
/**

1
apis/chef/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.chef.ChefApiMetadata

5
apis/cloudfiles/pom.xml
View File

@ -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>

3
apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
View File

@ -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

1
apis/cloudfiles/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.cloudfiles.CloudFilesApiMetadata

14
apis/cloudstack/pom.xml
View File

@ -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>

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
View File

@ -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

1
apis/cloudstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.cloudstack.CloudStackApiMetadata

5
apis/cloudwatch/pom.xml
View File

@ -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>

4
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
View File

@ -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 {

1
apis/cloudwatch/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.cloudwatch.CloudWatchApiMetadata

14
apis/ec2/pom.xml
View File

@ -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>

2
apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
View File

@ -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

1
apis/ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.ec2.EC2ApiMetadata

14
apis/elasticstack/pom.xml
View File

@ -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>

3
apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
View File

@ -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

1
apis/elasticstack/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.elasticstack.ElasticStackApiMetadata

5
apis/filesystem/pom.xml
View File

@ -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>

4
apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java
View File

@ -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

1
apis/filesystem/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.filesystem.FilesystemApiMetadata

11
apis/openstack-cinder/pom.xml
View File

@ -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>

5
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
View File

@ -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

18
apis/openstack-cinder/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -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

13
apis/openstack-keystone/pom.xml
View File

@ -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>

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
View File

@ -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

1
apis/openstack-keystone/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.openstack.keystone.v2_0.KeystoneApiMetadata

12
apis/openstack-nova-ec2/pom.xml
View File

@ -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>

3
apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java
View File

@ -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

1
apis/openstack-nova-ec2/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.openstack.nova.ec2.NovaEC2ApiMetadata

12
apis/openstack-nova/pom.xml
View File

@ -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>

5
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
View File

@ -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

1
apis/openstack-nova/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.openstack.nova.v2_0.NovaApiMetadata

5
apis/openstack-swift/pom.xml
View File

@ -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>

3
apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
View File

@ -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

18
apis/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -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

13
apis/openstack-trove/pom.xml
View File

@ -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>

5
apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApiMetadata.java
View File

@ -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

18
apis/openstack-trove/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -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

11
apis/rackspace-clouddns/pom.xml
View File

@ -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>

3
apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/CloudDNSApiMetadata.java
View File

@ -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

1
apis/rackspace-clouddns/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.rackspace.clouddns.v1.CloudDNSApiMetadata

11
apis/rackspace-cloudidentity/pom.xml
View File

@ -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>

2
apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
View File

@ -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

1
apis/rackspace-cloudidentity/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.rackspace.cloudidentity.v2_0.CloudIdentityApiMetadata

6
apis/rackspace-cloudloadbalancers/pom.xml
View File

@ -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>

7
apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/CloudLoadBalancersApiMetadata.java
View File

@ -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

1
apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApiMetadata

5
apis/route53/pom.xml
View File

@ -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>

4
apis/route53/src/main/java/org/jclouds/route53/Route53ApiMetadata.java
View File

@ -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

1
apis/route53/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.route53.Route53ApiMetadata

5
apis/s3/pom.xml
View File

@ -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>

2
apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
View File

@ -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

1
apis/s3/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.s3.S3ApiMetadata

5
apis/sqs/pom.xml
View File

@ -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>

3
apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java
View File

@ -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

1
apis/sqs/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.sqs.SQSApiMetadata

5
apis/sts/pom.xml
View File

@ -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>

4
apis/sts/src/main/java/org/jclouds/sts/STSApiMetadata.java
View File

@ -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

1
apis/sts/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.sts.STSApiMetadata

5
apis/swift/pom.xml
View File

@ -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>

5
apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
View File

@ -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() {

7
apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
View File

@ -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() {

2
apis/swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1,2 +0,0 @@
org.jclouds.openstack.swift.SwiftApiMetadata
org.jclouds.openstack.swift.SwiftKeystoneApiMetadata

6
blobstore/pom.xml
View File

@ -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>

4
blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java
View File

@ -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() {

1
blobstore/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.blobstore.TransientApiMetadata

5
compute/pom.xml
View File

@ -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>

4
compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java
View File

@ -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

1
compute/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1 +0,0 @@
org.jclouds.compute.stub.StubApiMetadata

5
core/pom.xml
View File

@ -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>

10
core/src/main/java/org/jclouds/logging/jdk/config/JDKLoggingModule.java
View File

@ -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();
}
}

1
core/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
View File

@ -1 +0,0 @@
org.jclouds.logging.jdk.config.JDKLoggingModule

5
core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java
View File

@ -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() {

5
core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java
View File

@ -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() {

5
core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java
View File

@ -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() {

6
core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
View File

@ -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));

6
core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
View File

@ -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());
}

8
core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java
View File

@ -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());
}

3
core/src/test/resources/META-INF/services/org.jclouds.apis.ApiMetadata
View File

@ -1,3 +0,0 @@
org.jclouds.apis.JcloudsTestBlobStoreApiMetadata
org.jclouds.apis.JcloudsTestComputeApiMetadata
org.jclouds.apis.JcloudsTestYetAnotherComputeApiMetadata

3
core/src/test/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

@ -1,3 +0,0 @@
org.jclouds.providers.JcloudsTestBlobStoreProviderMetadata
org.jclouds.providers.JcloudsTestComputeProviderMetadata
org.jclouds.providers.JcloudsTestYetAnotherComputeProviderMetadata

6
drivers/log4j/pom.xml
View File

@ -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>

3
drivers/log4j/src/main/java/org/jclouds/logging/log4j/config/Log4JLoggingModule.java
View File

@ -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

1
drivers/log4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
View File

@ -1 +0,0 @@
org.jclouds.logging.log4j.config.Log4JLoggingModule

5
drivers/slf4j/pom.xml
View File

@ -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>

3
drivers/slf4j/src/main/java/org/jclouds/logging/slf4j/config/SLF4JLoggingModule.java
View File

@ -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

1
drivers/slf4j/src/main/resources/META-INF/services/org.jclouds.logging.config.LoggingModule
View File

@ -1 +0,0 @@
org.jclouds.logging.slf4j.config.SLF4JLoggingModule

5
providers/aws-cloudwatch/pom.xml
View File

@ -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>

3
providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java
View File

@ -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() {

1
providers/aws-cloudwatch/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

@ -1 +0,0 @@
org.jclouds.aws.cloudwatch.AWSCloudWatchProviderMetadata

5
providers/aws-ec2/pom.xml
View File

@ -113,6 +113,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
<build>

4
providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
View File

@ -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() {

1
providers/aws-ec2/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata
View File

@ -1 +0,0 @@
org.jclouds.aws.ec2.AWSEC2ProviderMetadata

5
providers/aws-route53/pom.xml
View File

@ -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>

Some files were not shown because too many files have changed in this diff Show More