Merge branch 'master' of git://github.com/jclouds/jclouds

antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java

@@ -27,7 +27,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

apis/atmos/src/main/java/org/jclouds/atmos/domain/AtmosObject.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.atmos.domain;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.atmos.domain.internal.AtmosObjectImpl.AtmosObjectFactory;
 import org.jclouds.io.PayloadEnclosing;

apis/atmos/src/main/java/org/jclouds/atmos/domain/BoundedSet.java

@@ -20,7 +20,7 @@ package org.jclouds.atmos.domain;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.atmos.domain.internal.BoundedLinkedHashSet;
 

apis/atmos/src/main/java/org/jclouds/atmos/domain/SystemMetadata.java

@@ -20,7 +20,7 @@ package org.jclouds.atmos.domain;
 
 import java.util.Date;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * Metadata of a Atmos Online object

apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.LinkedHashSet;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.atmos.domain.BoundedSet;
 

apis/atmos/src/main/java/org/jclouds/atmos/functions/ReturnEndpointIfAlreadyExists.java

@@ -23,7 +23,7 @@ import static org.jclouds.util.Throwables2.propagateOrNull;
 
 import java.net.URI;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.blobstore.KeyAlreadyExistsException;
 import org.jclouds.http.HttpRequest;

apis/cloudservers/src/main/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptions.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.inject.Inject;
 
 import org.jclouds.http.HttpRequest;

apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Image.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * An image is a platonic form of a machine. Images are not directly executable, but are a template

apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Instance.java

@@ -24,7 +24,7 @@ import java.net.URI;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.http.HttpRequest;
 

apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/Realm.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * Within a cloud provider a realm represents a boundary containing resources. The exact definition

apis/deltacloud/src/main/java/org/jclouds/deltacloud/xml/HardwarePropertyHandler.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.deltacloud.domain.EnumHardwareProperty;
 import org.jclouds.deltacloud.domain.FixedHardwareProperty;

apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java

@@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkState;
 import java.util.Arrays;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.compute.options.TemplateOptions;
 import org.jclouds.domain.Credentials;

apis/ec2/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkState;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;

apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java

@@ -21,7 +21,7 @@ package org.jclouds.ec2.domain;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.util.Preconditions2;
 

apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleInstanceS3Storage.java

@@ -20,7 +20,7 @@ package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * 

apis/ec2/src/main/java/org/jclouds/ec2/domain/BundleTask.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Date;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * 

apis/ec2/src/main/java/org/jclouds/ec2/domain/Image.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;

apis/ec2/src/main/java/org/jclouds/ec2/domain/KeyPair.java

@@ -20,7 +20,7 @@ package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * 

apis/ec2/src/main/java/org/jclouds/ec2/domain/PublicIpInstanceIdPair.java

@@ -20,7 +20,7 @@ package org.jclouds.ec2.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * 

apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;

apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java

@@ -24,7 +24,7 @@ import java.util.Date;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;

apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java

@@ -18,11 +18,11 @@
  */
 package org.jclouds.ec2.domain;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
+
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * 

apis/ec2/src/main/java/org/jclouds/ec2/domain/Volume.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Date;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.base.CaseFormat;
 import com.google.common.collect.Iterables;

apis/ec2/src/main/java/org/jclouds/ec2/options/RegisterImageBackedByEbsOptions.java

@@ -21,7 +21,7 @@ package org.jclouds.ec2.options;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.ec2.domain.Image.Architecture;
 

apis/ec2/src/main/java/org/jclouds/ec2/services/AMIAsyncClient.java

@@ -24,7 +24,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;

apis/ec2/src/main/java/org/jclouds/ec2/services/AMIClient.java

@@ -22,7 +22,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.ec2.domain.Image;

apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionAsyncClient.java

@@ -25,7 +25,7 @@ import java.net.URI;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 

apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClient.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.ec2.domain.AvailabilityZoneInfo;
 import org.jclouds.ec2.options.DescribeAvailabilityZonesOptions;

apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreAsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;

apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreClient.java

@@ -21,7 +21,7 @@ package org.jclouds.ec2.services;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.ec2.domain.Attachment;
 import org.jclouds.ec2.domain.Permission;

apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressAsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;

apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressClient.java

@@ -21,7 +21,7 @@ package org.jclouds.ec2.services;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.aws.AWSResponseException;
 import org.jclouds.concurrent.Timeout;

apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceAsyncClient.java

@@ -24,7 +24,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;

apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceClient.java

@@ -22,7 +22,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.ec2.domain.BlockDevice;

apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairAsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;

apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairClient.java

@@ -21,7 +21,7 @@ package org.jclouds.ec2.services;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.ec2.domain.KeyPair;
 import org.jclouds.concurrent.Timeout;

apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -93,7 +93,7 @@ public interface SecurityGroupAsyncClient {
             @BinderParam(BindGroupNamesToIndexedFormParams.class) String... securityGroupNames);
 
    /**
-    * @see SecurityGroupClient#authorizeSecurityGroupIngressInRegion(@Nullable Region,
+    * @see SecurityGroupClient#authorizeSecurityGroupIngressInRegion(@ org.jclouds.javax.annotation.Nullable Region,
     *      String,UserIdGroupPair)
     */
    @POST
@@ -105,7 +105,7 @@ public interface SecurityGroupAsyncClient {
             @BinderParam(BindUserIdGroupPairToSourceSecurityGroupFormParams.class) UserIdGroupPair sourceSecurityGroup);
 
    /**
-    * @see SecurityGroupClient#authorizeSecurityGroupIngressInRegion(@Nullable Region,
+    * @see SecurityGroupClient#authorizeSecurityGroupIngressInRegion(@ org.jclouds.javax.annotation.Nullable Region,
     *      String,IpProtocol,int,int,String)
     */
    @POST
@@ -129,7 +129,7 @@ public interface SecurityGroupAsyncClient {
             @BinderParam(BindUserIdGroupPairToSourceSecurityGroupFormParams.class) UserIdGroupPair sourceSecurityGroup);
 
    /**
-    * @see SecurityGroupClient#revokeSecurityGroupIngressInRegion(@Nullable Region,
+    * @see SecurityGroupClient#revokeSecurityGroupIngressInRegion(@ org.jclouds.javax.annotation.Nullable Region,
     *      String,IpProtocol,int,int,String)
     */
    @POST

apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java

@@ -21,7 +21,7 @@ package org.jclouds.ec2.services;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.ec2.domain.IpProtocol;
 import org.jclouds.ec2.domain.SecurityGroup;

apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsAsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.aws.reference.FormParameters.VERSION;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;

apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsClient.java

@@ -21,7 +21,7 @@ package org.jclouds.ec2.services;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.ec2.domain.BundleTask;
 import org.jclouds.ec2.options.BundleInstanceS3StorageOptions;

apis/ec2/src/test/java/org/jclouds/ec2/compute/functions/RunningInstanceToNodeMetadataTest.java

@@ -25,7 +25,7 @@ import java.net.UnknownHostException;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.Image;

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/CreateDriveRequest.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 
 import com.google.common.collect.ImmutableSet;

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Drive.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 
 import com.google.common.collect.ImmutableSet;

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveData.java

@@ -20,7 +20,7 @@ package org.jclouds.elasticstack.domain;
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 
 /**

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/DriveInfo.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 
 import com.google.common.collect.ImmutableSet;

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Item.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/NIC.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableSet;
 

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/Server.java

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/ServerInfo.java

@@ -21,7 +21,7 @@ package org.jclouds.elasticstack.domain;
 import java.util.Date;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * 

apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/VNC.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.elasticstack.domain;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * 

apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java

@@ -54,7 +54,7 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.concurrent.ExecutorService;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Named;

apis/nova/src/main/java/org/jclouds/openstack/nova/domain/Address.java

@@ -20,8 +20,7 @@ package org.jclouds.openstack.nova.domain;
 
 import com.google.common.base.Function;
 import com.google.gson.annotations.SerializedName;
-
+import org.jclouds.javax.annotation.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * @author Dmitri Babaev

apis/s3/src/main/java/org/jclouds/s3/S3AsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.blobstore.attr.BlobScopes.CONTAINER;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.HEAD;

apis/s3/src/main/java/org/jclouds/s3/S3Client.java

@@ -22,7 +22,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.s3.domain.AccessControlList;
 import org.jclouds.s3.domain.BucketLogging;

apis/s3/src/main/java/org/jclouds/s3/config/S3RestClientModule.java

@@ -21,7 +21,7 @@ package org.jclouds.s3.config;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.inject.Named;
 import javax.inject.Singleton;
 

apis/s3/src/main/java/org/jclouds/s3/domain/S3Object.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.s3.domain;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.io.PayloadEnclosing;
 

apis/s3/src/main/java/org/jclouds/s3/functions/BindRegionToXmlPayload.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Singleton;

apis/s3/src/test/java/org/jclouds/s3/internal/StubS3AsyncClient.java

@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;

apis/swift/src/main/java/org/jclouds/openstack/swift/domain/SwiftObject.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.openstack.swift.domain;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.io.PayloadEnclosing;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudAsyncClient.java

@@ -37,7 +37,7 @@ import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;

apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudClient.java

@@ -23,7 +23,7 @@ import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.ovf.Envelope;

apis/vcloud/src/main/java/org/jclouds/vcloud/binders/BindInstantiateVAppTemplateParamsToXmlPayload.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.annotation.Resource;
 import javax.inject.Named;
 import javax.inject.Singleton;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Catalog.java

@@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.internal.CatalogImpl;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/NetworkConnection.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.vcloud.domain;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.network.IpAddressAllocationMode;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Org.java

@@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.internal.OrgImpl;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Task.java

@@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain;
 
 import java.util.Date;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.internal.TaskImpl;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VApp.java

@@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * A VApp is the result of instantiation of a {@link VAppTemplate}. <h2>note</h2>

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VAppTemplate.java

@@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.internal.VAppTemplateImpl;
 import org.jclouds.vcloud.domain.ovf.VCloudNetworkSection;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VCloudError.java

@@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.internal.ErrorImpl;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/VDC.java

@@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.internal.VDCImpl;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/Vm.java

@@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.internal.VmImpl;
 import org.jclouds.vcloud.domain.ovf.VCloudOperatingSystemSection;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java

@@ -25,7 +25,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.Catalog;
 import org.jclouds.vcloud.domain.ReferenceType;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogItemImpl.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.net.URI;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.VCloudMediaType;
 import org.jclouds.vcloud.domain.CatalogItem;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ErrorImpl.java

@@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.VCloudError;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/OrgImpl.java

@@ -24,7 +24,7 @@ import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.ReferenceType;
 import org.jclouds.vcloud.domain.Org;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.net.URI;
 import java.util.Date;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.VCloudMediaType;
 import org.jclouds.vcloud.domain.ReferenceType;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppImpl.java

@@ -24,7 +24,7 @@ import java.net.URI;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.ReferenceType;
 import org.jclouds.vcloud.domain.Status;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VAppTemplateImpl.java

@@ -24,7 +24,7 @@ import java.net.URI;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.ReferenceType;
 import org.jclouds.vcloud.domain.Status;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VDCImpl.java

@@ -24,7 +24,7 @@ import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.AllocationModel;
 import org.jclouds.vcloud.domain.Capacity;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/VmImpl.java

@@ -23,7 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.net.URI;
 import java.util.List;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.GuestCustomizationSection;
 import org.jclouds.vcloud.domain.NetworkConnectionSection;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.vcloud.domain.network;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * specifies the properties of the network’s DHCP service

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.vcloud.domain.network;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * The Features element defines the DHCP and firewall features of a network.

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.network.firewall.FirewallRule;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.network.nat.NatPolicy;
 import org.jclouds.vcloud.domain.network.nat.NatRule;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NetworkConfig.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/OrgNetwork.java

@@ -21,7 +21,7 @@ package org.jclouds.vcloud.domain.network;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.ReferenceType;
 import org.jclouds.vcloud.domain.Task;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java

@@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain.network.firewall;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * The FirewallRule element defines a single firewall rule.

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java

@@ -24,7 +24,7 @@ import java.net.URI;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.ReferenceType;
 import org.jclouds.vcloud.domain.Task;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/NatRule.java

@@ -18,7 +18,7 @@
  */
 package org.jclouds.vcloud.domain.network.nat;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java

@@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain.network.nat.rules;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.network.nat.NatRule;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java

@@ -20,7 +20,7 @@ package org.jclouds.vcloud.domain.network.nat.rules;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.vcloud.domain.network.nat.NatProtocol;
 import org.jclouds.vcloud.domain.network.nat.NatRule;

apis/vcloud/src/main/java/org/jclouds/vcloud/domain/ovf/VCloudOperatingSystemSection.java

@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.net.URI;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.ovf.OperatingSystemSection;
 import org.jclouds.vcloud.domain.ReferenceType;

apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogAsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.vcloud.VCloudMediaType.CATALOG_XML;
 
 import java.net.URI;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;

apis/vcloud/src/main/java/org/jclouds/vcloud/features/CatalogClient.java

@@ -22,7 +22,7 @@ import java.net.URI;
 import java.util.NoSuchElementException;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.vcloud.domain.Catalog;

apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkAsyncClient.java

@@ -22,7 +22,7 @@ import static org.jclouds.vcloud.VCloudMediaType.NETWORK_XML;
 
 import java.net.URI;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/features/NetworkClient.java

@@ -21,7 +21,7 @@ package org.jclouds.vcloud.features;
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.vcloud.domain.network.OrgNetwork;

apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgAsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.vcloud.VCloudMediaType.ORG_XML;
 import java.net.URI;
 import java.util.Map;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 

apis/vcloud/src/main/java/org/jclouds/vcloud/features/OrgClient.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.vcloud.domain.Org;

apis/vcloud/src/main/java/org/jclouds/vcloud/features/TaskAsyncClient.java

@@ -23,7 +23,7 @@ import static org.jclouds.vcloud.VCloudMediaType.TASK_XML;
 
 import java.net.URI;
 
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;