From 420503d32eef589086d652405cb5309f0a822006 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 12 Aug 2010 16:04:26 -0700 Subject: [PATCH] updated and corrected license headers --- README.txt | 19 ++++++ archetypes/compute-service-archetype/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 2 +- .../config/__providerName__ContextModule.java | 26 +-------- .../__providerName__RestClientModule.java | 26 +-------- .../reference/__providerName__Constants.java | 26 +-------- archetypes/pom.xml | 2 +- assemblies/pom.xml | 2 +- atmos/README.txt | 3 +- atmos/pom.xml | 2 +- .../saas/AtmosStorageAsyncClient.java | 3 +- .../atmosonline/saas/AtmosStorageClient.java | 3 +- .../saas/AtmosStorageContextBuilder.java | 3 +- .../saas/AtmosStorageResponseException.java | 3 +- .../saas/binders/BindMetadataToHeaders.java | 3 +- .../binders/BindUserMetadataToHeaders.java | 3 +- .../saas/blobstore/AtmosAsyncBlobStore.java | 3 +- .../saas/blobstore/AtmosBlobStore.java | 3 +- .../config/AtmosBlobStoreContextModule.java | 3 +- .../functions/BlobMetadataToObject.java | 3 +- .../BlobStoreListOptionsToListOptions.java | 3 +- .../functions/BlobToContentMetadata.java | 3 +- .../blobstore/functions/BlobToObject.java | 3 +- .../functions/BlobToSystemMetadata.java | 3 +- ...ectoryEntryListToResourceMetadataList.java | 3 +- .../blobstore/functions/ObjectToBlob.java | 3 +- .../functions/ObjectToBlobMetadata.java | 3 +- .../strategy/FindMD5InUserMetadata.java | 3 +- .../saas/config/AtmosObjectModule.java | 3 +- .../saas/config/AtmosStorageParserModule.java | 1 + .../config/AtmosStorageRestClientModule.java | 3 +- .../atmosonline/saas/domain/AtmosObject.java | 3 +- .../saas/domain/AtmosStorageError.java | 3 +- .../atmosonline/saas/domain/BoundedSet.java | 3 +- .../saas/domain/DirectoryEntry.java | 3 +- .../atmosonline/saas/domain/FileType.java | 3 +- .../saas/domain/MutableContentMetadata.java | 3 +- .../saas/domain/SystemMetadata.java | 3 +- .../atmosonline/saas/domain/UploadInfo.java | 3 +- .../atmosonline/saas/domain/UserMetadata.java | 3 +- .../saas/domain/internal/AtmosObjectImpl.java | 3 +- .../saas/domain/internal/BoundedHashSet.java | 3 +- .../DelegatingMutableContentMetadata.java | 19 ++++++ .../atmosonline/saas/filters/SignRequest.java | 3 +- .../saas/functions/AtmosObjectName.java | 3 +- ...rseDirectoryListFromContentAndHeaders.java | 3 +- .../ParseObjectFromHeadersAndHttpContent.java | 3 +- .../ParseSystemMetadataFromHeaders.java | 3 +- .../ParseUserMetadataFromHeaders.java | 3 +- .../ReturnEndpointIfAlreadyExists.java | 3 +- .../AtmosStorageClientErrorRetryHandler.java | 3 +- .../ParseAtmosStorageErrorFromXmlContent.java | 3 +- .../atmosonline/saas/options/ListOptions.java | 3 +- .../saas/reference/AtmosStorageHeaders.java | 3 +- .../saas/util/AtmosStorageUtils.java | 3 +- .../atmosonline/saas/xml/ErrorHandler.java | 3 +- .../xml/ListDirectoryResponseHandler.java | 3 +- .../saas/AtmosStorageAsyncClientTest.java | 3 +- .../saas/AtmosStorageClientLiveTest.java | 3 +- .../saas/ProvidersInPropertiesTest.java | 3 +- .../BindUserMetadataToHeadersTest.java | 3 +- .../config/AtmosBlobStoreModuleTest.java | 3 +- .../ListOptionsToBlobStoreListOptions.java | 3 +- .../functions/ObjectToBlobMetadataTest.java | 3 +- ...ourceMetadataListToDirectoryEntryList.java | 3 +- ...osStorageContainerIntegrationLiveTest.java | 3 +- .../AtmosStorageContainerLiveTest.java | 3 +- ...rageInputStreamMapIntegrationLiveTest.java | 3 +- .../AtmosStorageIntegrationLiveTest.java | 3 +- .../integration/AtmosStorageLiveTest.java | 3 +- .../AtmosStorageMapIntegrationLiveTest.java | 3 +- ...tmosStorageServiceIntegrationLiveTest.java | 3 +- .../AtmosStorageTestInitializer.java | 3 +- .../saas/filters/SignRequestTest.java | 3 +- .../ParseSystemMetadataFromHeadersTest.java | 3 +- .../internal/StubAtmosStorageAsyncClient.java | 3 +- .../saas/options/ListOptionsTest.java | 3 +- .../saas/xml/ErrorHandlerTest.java | 3 +- .../xml/ListDirectoryResponseHandlerTest.java | 3 +- aws/core/README.txt | 3 +- aws/core/pom.xml | 2 +- .../src/main/clojure/org/jclouds/aws/ebs.clj | 35 +++++------ .../clojure/org/jclouds/aws/elastic_ip.clj | 35 +++++------ .../org/jclouds/aws/AWSResponseException.java | 3 +- .../src/main/java/org/jclouds/aws/Region.java | 3 +- .../AWSFormSigningRestClientModule.java | 3 +- .../aws/config/AWSRestClientModule.java | 2 +- .../aws/config/DefaultLocationProvider.java | 3 +- .../java/org/jclouds/aws/domain/AWSError.java | 3 +- .../java/org/jclouds/aws/domain/Region.java | 3 +- .../jclouds/aws/ec2/ConfigureELBModule.java | 3 +- .../org/jclouds/aws/ec2/EC2AsyncClient.java | 3 +- .../java/org/jclouds/aws/ec2/EC2Client.java | 3 +- .../jclouds/aws/ec2/EC2ContextBuilder.java | 3 +- .../jclouds/aws/ec2/EC2PropertiesBuilder.java | 3 +- .../aws/ec2/EucalyptusPropertiesBuilder.java | 3 +- ...BlockDeviceMappingToIndexedFormParams.java | 3 +- .../BindBundleIdsToIndexedFormParams.java | 3 +- .../BindGroupNameToIndexedFormParams.java | 3 +- .../BindInstanceIdsToIndexedFormParams.java | 3 +- .../BindKeyNameToIndexedFormParams.java | 3 +- .../BindProductCodesToIndexedFormParams.java | 3 +- .../BindPublicIpsToIndexedFormParams.java | 3 +- .../BindS3UploadPolicyAndSignature.java | 3 +- .../BindUserGroupsToIndexedFormParams.java | 3 +- ...upPairToSourceSecurityGroupFormParams.java | 3 +- .../BindUserIdsToIndexedFormParams.java | 3 +- .../BindVolumeIdsToIndexedFormParams.java | 3 +- ...otNullBindAvailabilityZoneToFormParam.java | 3 +- .../aws/ec2/compute/EC2ComputeService.java | 3 +- .../EC2ComputeServiceContextModule.java | 3 +- .../config/EC2ResolveImagesModule.java | 1 + .../aws/ec2/compute/domain/EC2Size.java | 3 +- .../aws/ec2/compute/domain/RegionAndName.java | 3 +- .../domain/RegionNameAndIngressRules.java | 2 +- .../CreatePlacementGroupIfNeeded.java | 3 +- .../CreateSecurityGroupIfNeeded.java | 3 +- .../functions/CreateUniqueKeyPair.java | 2 +- .../ec2/compute/functions/ImageParser.java | 3 +- .../compute/functions/RegionAndIdToImage.java | 1 + .../RunningInstanceToNodeMetadata.java | 3 +- .../internal/EC2TemplateBuilderImpl.java | 3 +- .../compute/options/EC2TemplateOptions.java | 3 +- ...rityGroupsAsNeededAndReturnRunOptions.java | 3 +- .../strategy/DescribeImagesParallel.java | 3 +- .../EC2DestroyLoadBalancerStrategy.java | 2 +- .../strategy/EC2DestroyNodeStrategy.java | 2 +- .../strategy/EC2LoadBalanceNodesStrategy.java | 2 +- ...faultLoginCredentialsForImageStrategy.java | 1 + .../EC2RunNodesAndAddToSetStrategy.java | 2 +- .../aws/ec2/compute/util/EC2ComputeUtils.java | 2 +- .../aws/ec2/config/EC2RestClientModule.java | 3 +- .../jclouds/aws/ec2/domain/Attachment.java | 3 +- .../aws/ec2/domain/AvailabilityZone.java | 3 +- .../aws/ec2/domain/AvailabilityZoneInfo.java | 3 +- .../aws/ec2/domain/BlockDeviceMapping.java | 1 + .../ec2/domain/BundleInstanceS3Storage.java | 3 +- .../jclouds/aws/ec2/domain/BundleTask.java | 3 +- .../org/jclouds/aws/ec2/domain/Image.java | 3 +- .../aws/ec2/domain/ImageAttribute.java | 3 +- .../jclouds/aws/ec2/domain/InstanceState.java | 3 +- .../aws/ec2/domain/InstanceStateChange.java | 3 +- .../jclouds/aws/ec2/domain/InstanceType.java | 3 +- .../jclouds/aws/ec2/domain/IpPermission.java | 3 +- .../jclouds/aws/ec2/domain/IpProtocol.java | 3 +- .../org/jclouds/aws/ec2/domain/KeyPair.java | 3 +- .../aws/ec2/domain/MonitoringState.java | 3 +- .../jclouds/aws/ec2/domain/Permission.java | 3 +- .../aws/ec2/domain/PlacementGroup.java | 3 +- .../ec2/domain/PublicIpInstanceIdPair.java | 3 +- .../jclouds/aws/ec2/domain/Reservation.java | 3 +- .../ec2/domain/ReservedInstancesOffering.java | 3 +- .../aws/ec2/domain/RootDeviceType.java | 3 +- .../aws/ec2/domain/RunningInstance.java | 3 +- .../jclouds/aws/ec2/domain/SecurityGroup.java | 3 +- .../org/jclouds/aws/ec2/domain/Snapshot.java | 3 +- .../aws/ec2/domain/UserIdGroupPair.java | 3 +- .../org/jclouds/aws/ec2/domain/Volume.java | 3 +- .../functions/AvailabilityZoneToEndpoint.java | 3 +- ...rtUnencodedBytesToBase64EncodedString.java | 3 +- .../ReturnVoidOnVolumeAvailable.java | 3 +- .../RunningInstanceToStorageMappingUnix.java | 1 + .../BundleInstanceS3StorageOptions.java | 3 +- .../aws/ec2/options/CreateImageOptions.java | 3 +- .../ec2/options/CreateSnapshotOptions.java | 3 +- .../DescribeAvailabilityZonesOptions.java | 3 +- .../ec2/options/DescribeImagesOptions.java | 3 +- .../ec2/options/DescribeRegionsOptions.java | 3 +- .../ec2/options/DescribeSnapshotsOptions.java | 3 +- .../aws/ec2/options/DetachVolumeOptions.java | 3 +- .../RegisterImageBackedByEbsOptions.java | 3 +- .../aws/ec2/options/RegisterImageOptions.java | 3 +- .../aws/ec2/options/RunInstancesOptions.java | 3 +- .../internal/BaseEC2RequestOptions.java | 3 +- .../ec2/predicates/InstanceHasIpAddress.java | 3 +- .../aws/ec2/predicates/InstancePresent.java | 3 +- .../ec2/predicates/InstanceStateRunning.java | 3 +- .../ec2/predicates/InstanceStateStopped.java | 3 +- .../predicates/InstanceStateTerminated.java | 3 +- .../predicates/PlacementGroupAvailable.java | 3 +- .../ec2/predicates/PlacementGroupDeleted.java | 3 +- .../aws/ec2/predicates/SnapshotCompleted.java | 3 +- .../aws/ec2/predicates/VolumeAttached.java | 3 +- .../aws/ec2/predicates/VolumeAvailable.java | 3 +- .../aws/ec2/reference/EC2Constants.java | 3 +- .../aws/ec2/reference/EC2Parameters.java | 3 +- .../aws/ec2/services/AMIAsyncClient.java | 3 +- .../jclouds/aws/ec2/services/AMIClient.java | 3 +- .../AvailabilityZoneAndRegionAsyncClient.java | 3 +- .../AvailabilityZoneAndRegionClient.java | 3 +- .../ElasticBlockStoreAsyncClient.java | 3 +- .../ec2/services/ElasticBlockStoreClient.java | 3 +- .../services/ElasticIPAddressAsyncClient.java | 3 +- .../ec2/services/ElasticIPAddressClient.java | 3 +- .../aws/ec2/services/InstanceAsyncClient.java | 3 +- .../aws/ec2/services/InstanceClient.java | 3 +- .../aws/ec2/services/KeyPairAsyncClient.java | 3 +- .../aws/ec2/services/KeyPairClient.java | 3 +- .../ec2/services/MonitoringAsyncClient.java | 3 +- .../aws/ec2/services/MonitoringClient.java | 3 +- .../services/PlacementGroupAsyncClient.java | 3 +- .../ec2/services/PlacementGroupClient.java | 3 +- .../services/SecurityGroupAsyncClient.java | 3 +- .../aws/ec2/services/SecurityGroupClient.java | 3 +- .../aws/ec2/services/WindowsAsyncClient.java | 3 +- .../aws/ec2/services/WindowsClient.java | 3 +- .../org/jclouds/aws/ec2/util/EC2Utils.java | 3 +- .../xml/AllocateAddressResponseHandler.java | 3 +- .../aws/ec2/xml/AttachmentHandler.java | 3 +- .../aws/ec2/xml/BaseReservationHandler.java | 3 +- .../ec2/xml/BlockDeviceMappingHandler.java | 3 +- .../aws/ec2/xml/BooleanValueHandler.java | 3 +- .../aws/ec2/xml/BundleTaskHandler.java | 3 +- .../CreateLoadBalancerResponseHandler.java | 19 ++++++ .../ec2/xml/CreateVolumeResponseHandler.java | 3 +- .../xml/DescribeAddressesResponseHandler.java | 3 +- ...cribeAvailabilityZonesResponseHandler.java | 3 +- .../DescribeBundleTasksResponseHandler.java | 19 ++++++ .../xml/DescribeImagesResponseHandler.java | 3 +- .../xml/DescribeInstancesResponseHandler.java | 3 +- .../xml/DescribeKeyPairsResponseHandler.java | 3 +- ...escribePlacementGroupsResponseHandler.java | 3 +- .../xml/DescribeRegionsResponseHandler.java | 3 +- ...ervedInstancesOfferingResponseHandler.java | 19 ++++++ ...DescribeSecurityGroupsResponseHandler.java | 3 +- .../xml/DescribeSnapshotsResponseHandler.java | 3 +- .../xml/DescribeVolumesResponseHandler.java | 3 +- .../jclouds/aws/ec2/xml/ImageIdHandler.java | 3 +- ...tanceInitiatedShutdownBehaviorHandler.java | 3 +- .../ec2/xml/InstanceStateChangeHandler.java | 3 +- .../aws/ec2/xml/InstanceTypeHandler.java | 3 +- .../aws/ec2/xml/KeyPairResponseHandler.java | 3 +- .../aws/ec2/xml/MonitoringStateHandler.java | 3 +- .../aws/ec2/xml/PermissionHandler.java | 3 +- .../aws/ec2/xml/PlacementGroupHandler.java | 3 +- .../aws/ec2/xml/ProductCodesHandler.java | 3 +- ...tancesWithLoadBalancerResponseHandler.java | 19 ++++++ .../xml/ReservedInstancesOfferingHandler.java | 3 +- .../ec2/xml/RunInstancesResponseHandler.java | 3 +- .../jclouds/aws/ec2/xml/SnapshotHandler.java | 3 +- .../aws/ec2/xml/StringValueHandler.java | 3 +- .../ec2/xml/UnencodeStringValueHandler.java | 3 +- .../org/jclouds/aws/elb/ELBAsyncClient.java | 3 +- .../java/org/jclouds/aws/elb/ELBClient.java | 3 +- .../jclouds/aws/elb/ELBContextBuilder.java | 19 ++++++ .../jclouds/aws/elb/ELBPropertiesBuilder.java | 3 +- ...dAvailabilityZonesToIndexedFormParams.java | 3 +- ...BindELBInstanceIdsToIndexedFormParams.java | 3 +- .../aws/elb/config/ELBRestClientModule.java | 3 +- .../jclouds/aws/elb/domain/LoadBalancer.java | 2 +- .../DescribeLoadBalancersResponseHandler.java | 3 +- .../org/jclouds/aws/filters/FormSigner.java | 3 +- .../aws/functions/RegionToEndpoint.java | 3 +- .../handlers/AWSClientErrorRetryHandler.java | 3 +- .../handlers/AWSRedirectionRetryHandler.java | 3 +- .../handlers/ParseAWSErrorFromXmlContent.java | 3 +- .../jclouds/aws/handlers/package-info.java | 3 +- .../jclouds/aws/reference/AWSConstants.java | 3 +- .../main/java/org/jclouds/aws/s3/Bucket.java | 3 +- .../s3/GoogleStoragePropertiesBuilder.java | 3 +- .../org/jclouds/aws/s3/S3AsyncClient.java | 3 +- .../java/org/jclouds/aws/s3/S3Client.java | 3 +- .../org/jclouds/aws/s3/S3ContextBuilder.java | 3 +- .../jclouds/aws/s3/S3PropertiesBuilder.java | 3 +- .../aws/s3/WalrusPropertiesBuilder.java | 3 +- .../aws/s3/binders/BindACLToXMLPayload.java | 3 +- .../binders/BindAsHostPrefixIfConfigured.java | 3 +- .../BindBucketLoggingToXmlPayload.java | 3 +- .../BindNoBucketLoggingToXmlPayload.java | 3 +- .../aws/s3/binders/BindPayerToXmlPayload.java | 3 +- .../aws/s3/binders/BindS3ObjectToPayload.java | 3 +- .../aws/s3/blobstore/S3AsyncBlobStore.java | 3 +- .../jclouds/aws/s3/blobstore/S3BlobStore.java | 3 +- .../config/S3BlobStoreContextModule.java | 3 +- .../s3/blobstore/functions/BlobToObject.java | 3 +- .../functions/BlobToObjectMetadata.java | 3 +- .../functions/BucketToResourceList.java | 3 +- .../functions/BucketToResourceMetadata.java | 3 +- .../CommonPrefixesToResourceMetadata.java | 3 +- .../ContainerToBucketListOptions.java | 3 +- .../s3/blobstore/functions/ObjectToBlob.java | 3 +- .../functions/ObjectToBlobMetadata.java | 3 +- .../jclouds/aws/s3/config/S3ObjectModule.java | 3 +- .../jclouds/aws/s3/config/S3ParserModule.java | 1 + .../aws/s3/config/S3RestClientModule.java | 3 +- .../jclouds/aws/s3/config/package-info.java | 3 +- .../aws/s3/domain/AccessControlList.java | 3 +- .../jclouds/aws/s3/domain/BucketLogging.java | 3 +- .../jclouds/aws/s3/domain/BucketMetadata.java | 3 +- .../aws/s3/domain/CannedAccessPolicy.java | 3 +- .../jclouds/aws/s3/domain/CanonicalUser.java | 3 +- .../aws/s3/domain/ListBucketResponse.java | 3 +- .../aws/s3/domain/MutableObjectMetadata.java | 3 +- .../jclouds/aws/s3/domain/ObjectMetadata.java | 3 +- .../java/org/jclouds/aws/s3/domain/Payer.java | 3 +- .../org/jclouds/aws/s3/domain/S3Object.java | 3 +- .../internal/BucketListObjectMetadata.java | 3 +- .../s3/domain/internal/CopyObjectResult.java | 3 +- .../DelegatingMutableObjectMetadata.java | 3 +- .../internal/ListBucketResponseImpl.java | 3 +- .../internal/MutableObjectMetadataImpl.java | 3 +- .../aws/s3/domain/internal/S3ObjectImpl.java | 3 +- .../jclouds/aws/s3/domain/package-info.java | 3 +- .../s3/filters/RequestAuthorizeSignature.java | 3 +- .../jclouds/aws/s3/filters/package-info.java | 3 +- .../s3/functions/BindRegionToXmlPayload.java | 2 +- .../jclouds/aws/s3/functions/ObjectKey.java | 3 +- .../ParseObjectFromHeadersAndHttpContent.java | 3 +- .../ParseObjectMetadataFromHeaders.java | 3 +- .../ReturnFalseIfBucketAlreadyOwnedByYou.java | 3 +- ...urnTrueOn404OrNotFoundFalseIfNotEmpty.java | 3 +- .../aws/s3/functions/package-info.java | 3 +- .../aws/s3/options/CopyObjectOptions.java | 3 +- .../aws/s3/options/ListBucketOptions.java | 3 +- .../aws/s3/options/PutBucketOptions.java | 3 +- .../aws/s3/options/PutObjectOptions.java | 3 +- .../jclouds/aws/s3/options/package-info.java | 3 +- .../java/org/jclouds/aws/s3/package-info.java | 3 +- .../validators/BucketNameValidator.java | 19 ++++++ .../jclouds/aws/s3/reference/S3Constants.java | 3 +- .../jclouds/aws/s3/reference/S3Headers.java | 3 +- .../aws/s3/reference/package-info.java | 3 +- .../java/org/jclouds/aws/s3/util/S3Utils.java | 3 +- .../org/jclouds/aws/s3/util/package-info.java | 3 +- .../aws/s3/xml/AccessControlListHandler.java | 3 +- .../aws/s3/xml/BucketLoggingHandler.java | 3 +- .../jclouds/aws/s3/xml/CopyObjectHandler.java | 3 +- .../aws/s3/xml/ListAllMyBucketsHandler.java | 3 +- .../jclouds/aws/s3/xml/ListBucketHandler.java | 3 +- .../aws/s3/xml/LocationConstraintHandler.java | 3 +- .../org/jclouds/aws/s3/xml/PayerHandler.java | 3 +- .../org/jclouds/aws/s3/xml/package-info.java | 3 +- .../org/jclouds/aws/sqs/SQSAsyncClient.java | 3 +- .../java/org/jclouds/aws/sqs/SQSClient.java | 3 +- .../jclouds/aws/sqs/SQSContextBuilder.java | 3 +- .../jclouds/aws/sqs/SQSPropertiesBuilder.java | 3 +- .../aws/sqs/config/SQSRestClientModule.java | 3 +- .../org/jclouds/aws/sqs/domain/Queue.java | 3 +- .../aws/sqs/functions/QueueLocation.java | 3 +- .../aws/sqs/options/CreateQueueOptions.java | 3 +- .../aws/sqs/options/ListQueuesOptions.java | 3 +- .../org/jclouds/aws/sqs/package-info.java | 3 +- .../aws/sqs/reference/SQSParameters.java | 2 +- .../aws/sqs/reference/package-info.java | 3 +- .../sqs/xml/ListQueuesResponseHandler.java | 3 +- .../org/jclouds/aws/sqs/xml/MD5Handler.java | 3 +- .../org/jclouds/aws/sqs/xml/QueueHandler.java | 3 +- .../xml/RegexListQueuesResponseHandler.java | 3 +- .../jclouds/aws/sqs/xml/RegexMD5Handler.java | 3 +- .../aws/sqs/xml/RegexQueueHandler.java | 3 +- .../xml/internal/BaseRegexQueueHandler.java | 3 +- .../java/org/jclouds/aws/util/AWSUtils.java | 3 +- .../org/jclouds/aws/xml/ErrorHandler.java | 3 +- .../aws/ProvidersInPropertiesTest.java | 3 +- ...icationArchitecturesEC2ClientLiveTest.java | 3 +- .../aws/ec2/EBSBootEC2ClientLiveTest.java | 3 +- .../jclouds/aws/ec2/EC2AsyncClientTest.java | 19 ++++++ .../compute/EC2ComputeServiceLiveTest.java | 3 +- .../ec2/compute/EC2ComputeServiceTest.java | 25 ++++---- .../EC2LoadBalancerServiceLiveTest.java | 3 +- .../compute/EC2TemplateBuilderLiveTest.java | 3 +- .../EucalyptusComputeServiceLiveTest.java | 3 +- .../compute/functions/ImageParserTest.java | 3 +- .../functions/RegionAndIdToImageTest.java | 3 +- .../RunningInstanceToNodeMetadataTest.java | 3 +- .../internal/EC2TemplateBuilderImplTest.java | 3 +- .../options/EC2TemplateOptionsTest.java | 2 +- ...GroupsAsNeededAndReturnRunOptionsTest.java | 3 +- .../EC2RunNodesAndAddToSetStrategyTest.java | 3 +- ...encodedBytesToBase64EncodedStringTest.java | 2 +- ...nningInstanceToStorageMappingUnixTest.java | 1 + .../BundleInstanceS3StorageOptionsTest.java | 3 +- .../ec2/options/CreateImageOptionsTest.java | 3 +- .../options/CreateSnapshotOptionsTest.java | 3 +- .../options/DescribeImagesOptionsTest.java | 3 +- .../options/DescribeSnapshotsOptionsTest.java | 3 +- .../ec2/options/DetachVolumeOptionsTest.java | 3 +- .../RegisterImageBackedByEbsOptionsTest.java | 3 +- .../ec2/options/RegisterImageOptionsTest.java | 3 +- .../ec2/options/RunInstancesOptionsTest.java | 3 +- .../aws/ec2/services/AMIAsyncClientTest.java | 3 +- .../aws/ec2/services/AMIClientLiveTest.java | 3 +- ...ilabilityZoneAndRegionAsyncClientTest.java | 3 +- ...ailabilityZoneAndRegionClientLiveTest.java | 3 +- .../ec2/services/BaseEC2AsyncClientTest.java | 3 +- .../ElasticBlockStoreAsyncClientTest.java | 3 +- .../ElasticBlockStoreClientLiveTest.java | 3 +- .../ElasticIPAddressAsyncClientTest.java | 3 +- .../ElasticIPAddressClientLiveTest.java | 3 +- .../ec2/services/InstanceAsyncClientTest.java | 3 +- .../ec2/services/InstanceClientLiveTest.java | 3 +- .../ec2/services/KeyPairAsyncClientTest.java | 3 +- .../ec2/services/KeyPairClientLiveTest.java | 3 +- .../services/MonitoringAsyncClientTest.java | 3 +- .../services/MonitoringClientLiveTest.java | 3 +- .../PlacementGroupAsyncClientTest.java | 3 +- .../PlacementGroupClientLiveTest.java | 3 +- .../SecurityGroupAsyncClientTest.java | 3 +- .../services/SecurityGroupClientLiveTest.java | 3 +- .../ec2/services/WindowsAsyncClientTest.java | 3 +- .../ec2/services/WindowsClientLiveTest.java | 3 +- .../jclouds/aws/ec2/utils/EC2UtilsTest.java | 3 +- .../AllocateAddressResponseHandlerTest.java | 3 +- .../aws/ec2/xml/AttachmentHandlerTest.java | 3 +- .../aws/ec2/xml/BaseEC2HandlerTest.java | 3 +- .../xml/BlockDeviceMappingHandlerTest.java | 3 +- .../aws/ec2/xml/BundleTaskHandlerTest.java | 3 +- .../xml/CreateVolumeResponseHandlerTest.java | 3 +- .../DescribeAddressesResponseHandlerTest.java | 3 +- ...eAvailabilityZonesResponseHandlerTest.java | 3 +- ...escribeBundleTasksResponseHandlerTest.java | 3 +- .../DescribeImagesResponseHandlerTest.java | 3 +- .../xml/DescribeInstanceAttributeTest.java | 3 +- .../DescribeInstancesResponseHandlerTest.java | 3 +- .../DescribeKeyPairsResponseHandlerTest.java | 3 +- ...ibePlacementGroupsResponseHandlerTest.java | 3 +- .../DescribeRegionsResponseHandlerTest.java | 3 +- ...dInstancesOfferingResponseHandlerTest.java | 3 +- ...ribeSecurityGroupsResponseHandlerTest.java | 3 +- .../DescribeSnapshotsResponseHandlerTest.java | 3 +- .../DescribeVolumesResponseHandlerTest.java | 3 +- .../xml/InstanceStateChangeHandlerTest.java | 3 +- .../ec2/xml/KeyPairResponseHandlerTest.java | 3 +- .../ec2/xml/MonitoringStateHandlerTest.java | 3 +- .../aws/ec2/xml/PermissionHandlerTest.java | 3 +- .../aws/ec2/xml/ProductCodesHandlerTest.java | 3 +- ...esWithLoadBalancerResponseHandlerTest.java | 3 +- .../xml/RunInstancesResponseHandlerTest.java | 3 +- .../aws/ec2/xml/SnapshotHandlerTest.java | 3 +- .../jclouds/aws/elb/ELBAsyncClientTest.java | 3 +- .../jclouds/aws/elb/ELBClientLiveTest.java | 3 +- ...scribeLoadBalancerResponseHandlerTest.java | 3 +- .../jclouds/aws/filters/FormSignerTest.java | 3 +- .../AWSClientErrorRetryHandlerTest.java | 3 +- .../ParseAWSErrorFromXmlContentTest.java | 19 ++++++ .../jclouds/aws/s3/BaseS3AsyncClientTest.java | 3 +- .../org/jclouds/aws/s3/S3AsyncClientTest.java | 3 +- .../org/jclouds/aws/s3/S3ClientLiveTest.java | 3 +- .../BindAsHostPrefixIfConfiguredTest.java | 3 +- .../BindBucketLoggingToXmlPayloadTest.java | 3 +- .../BindNoBucketLoggingToXmlPayloadTest.java | 3 +- .../s3/binders/BindS3ObjectToPayloadTest.java | 3 +- .../functions/BlobToHttpGetOptionsTest.java | 3 +- .../BucketToContainerListOptions.java | 3 +- .../functions/ResourceToBucketList.java | 3 +- .../S3BlobIntegrationLiveTest.java | 3 +- .../blobstore/integration/S3BlobLiveTest.java | 3 +- .../S3BlobMapIntegrationLiveTest.java | 3 +- .../S3ContainerIntegrationLiveTest.java | 3 +- .../integration/S3ContainerLiveTest.java | 3 +- .../S3InputStreamMapIntegrationLiveTest.java | 3 +- .../S3ServiceIntegrationLiveTest.java | 3 +- .../integration/S3TestInitializer.java | 3 +- .../aws/s3/config/S3RestClientModuleTest.java | 3 +- .../RequestAuthorizeSignatureTest.java | 3 +- .../ParseObjectMetadataFromHeadersTest.java | 3 +- ...turnTrueIfBucketAlreadyOwnedByYouTest.java | 3 +- .../aws/s3/internal/StubS3AsyncClient.java | 3 +- .../aws/s3/options/CopyObjectOptionsTest.java | 3 +- .../aws/s3/options/ListBucketOptionsTest.java | 3 +- .../aws/s3/options/PutBucketOptionsTest.java | 3 +- .../aws/s3/options/PutObjectOptionsTest.java | 3 +- .../aws/s3/services/BucketsLiveTest.java | 3 +- .../s3/xml/AccessControlListHandlerTest.java | 3 +- .../aws/s3/xml/BucketLoggingHandlerTest.java | 3 +- .../aws/s3/xml/CopyObjectHandlerTest.java | 3 +- .../aws/s3/xml/ListBucketHandlerTest.java | 3 +- .../jclouds/aws/s3/xml/PayerHandlerTest.java | 3 +- .../org/jclouds/aws/s3/xml/S3ParserTest.java | 3 +- .../jclouds/aws/sqs/SQSAsyncClientTest.java | 3 +- .../jclouds/aws/sqs/SQSClientLiveTest.java | 3 +- .../sqs/config/SQSRestClientModuleTest.java | 2 +- .../sqs/options/CreateQueueOptionsTest.java | 2 +- .../sqs/options/ListQueuesOptionsTest.java | 2 +- .../xml/ListQueuesResponseHandlerTest.java | 3 +- .../org/jclouds/aws/util/AWSUtilsTest.java | 3 +- .../org/jclouds/aws/xml/ErrorHandlerTest.java | 3 +- aws/demos/createandlistbuckets/README.txt | 3 +- aws/demos/createandlistbuckets/pom.xml | 2 +- .../org/jclouds/aws/s3/samples/MainApp.java | 3 +- aws/demos/createlamp/README.txt | 3 +- aws/demos/createlamp/pom.xml | 2 +- .../aws/ec2/demos/createlamp/MainApp.java | 3 +- aws/demos/googleappengine/README.txt | 3 +- aws/demos/googleappengine/pom.xml | 2 +- .../src/main/appengine/appengine-web.xml | 3 +- .../src/main/appengine/logging.properties | 58 +------------------ .../GetAllStatusController.java | 3 +- .../config/GuiceServletConfig.java | 3 +- .../googleappengine/domain/StatusResult.java | 3 +- .../BlobStoreContextToStatusResult.java | 3 +- .../ComputeServiceContextToStatusResult.java | 3 +- .../src/main/webapp/WEB-INF/jsp/status.jsp | 3 +- .../src/main/webapp/WEB-INF/web.xml | 3 +- .../googleappengine/src/main/webapp/index.jsp | 3 +- .../functest/GoogleAppEngineLiveTest.java | 3 +- .../functest/GoogleDevServer.java | 3 +- aws/demos/pom.xml | 2 +- aws/demos/speedtest-sqs/README.txt | 3 +- aws/demos/speedtest-sqs/pom.xml | 2 +- .../java/org/jclouds/aws/sqs/SpeedTest.java | 3 +- aws/extensions/jets3t/README.txt | 3 +- aws/extensions/jets3t/pom.xml | 2 +- .../aws/s3/jets3t/JCloudsS3Service.java | 3 +- .../java/org/jclouds/aws/s3/jets3t/Util.java | 3 +- .../s3/jets3t/JCloudsS3ServiceLiveTest.java | 3 +- aws/extensions/pom.xml | 2 +- aws/perftest/README.txt | 19 ++++++ aws/perftest/pom.xml | 2 +- .../aws/s3/AmazonPerformanceLiveTest.java | 3 +- .../s3/BaseJCloudsPerformanceLiveTest.java | 3 +- .../aws/s3/BasePerformanceLiveTest.java | 3 +- .../JCloudsApacheHCPerformanceLiveTest.java | 3 +- .../aws/s3/JCloudsGaePerformanceLiveTest.java | 3 +- .../aws/s3/JCloudsPerformanceLiveTest.java | 3 +- .../aws/s3/Jets3tPerformanceLiveTest.java | 26 +-------- aws/pom.xml | 2 +- azure/README.txt | 3 +- azure/pom.xml | 2 +- .../storage/AzureStorageContextBuilder.java | 3 +- .../AzureStoragePropertiesBuilder.java | 3 +- .../AzureStorageResponseException.java | 3 +- .../storage/blob/AzureBlobAsyncClient.java | 3 +- .../azure/storage/blob/AzureBlobClient.java | 3 +- .../storage/blob/AzureBlobContextBuilder.java | 3 +- .../azure/storage/blob/AzureBlobUtil.java | 3 +- .../blob/binders/BindAzureBlobToPayload.java | 3 +- .../blob/blobstore/AzureAsyncBlobStore.java | 3 +- .../blob/blobstore/AzureBlobStore.java | 3 +- .../config/AzureBlobStoreContextModule.java | 3 +- .../blobstore/functions/AzureBlobToBlob.java | 3 +- .../BlobMetadataToBlobProperties.java | 3 +- .../BlobPropertiesToBlobMetadata.java | 3 +- .../blobstore/functions/BlobToAzureBlob.java | 3 +- .../ContainerToResourceMetadata.java | 3 +- .../ListBlobsResponseToResourceList.java | 3 +- .../ListOptionsToListBlobsOptions.java | 3 +- .../strategy/FindMD5InBlobProperties.java | 3 +- .../storage/blob/config/AzureBlobModule.java | 3 +- .../config/AzureBlobRestClientModule.java | 3 +- .../azure/storage/blob/domain/AzureBlob.java | 3 +- .../storage/blob/domain/BlobProperties.java | 3 +- .../azure/storage/blob/domain/BlobType.java | 3 +- .../blob/domain/ContainerProperties.java | 3 +- .../storage/blob/domain/LeaseStatus.java | 3 +- .../blob/domain/ListBlobsResponse.java | 3 +- .../blob/domain/MutableBlobProperties.java | 3 +- ...utableContainerPropertiesWithMetadata.java | 3 +- .../blob/domain/internal/AzureBlobImpl.java | 3 +- .../domain/internal/BlobPropertiesImpl.java | 3 +- .../internal/ContainerPropertiesImpl.java | 3 +- .../DelegatingMutableBlobProperties.java | 3 +- .../internal/HashSetListBlobsResponse.java | 3 +- .../internal/MutableBlobPropertiesImpl.java | 3 +- ...leContainerPropertiesWithMetadataImpl.java | 3 +- .../storage/blob/functions/BlobName.java | 3 +- .../ParseBlobFromHeadersAndHttpContent.java | 3 +- .../ParseBlobPropertiesFromHeaders.java | 3 +- .../ParseContainerPropertiesFromHeaders.java | 3 +- .../ReturnFalseIfContainerAlreadyExists.java | 3 +- .../blob/options/CreateContainerOptions.java | 3 +- .../blob/options/ListBlobsOptions.java | 3 +- .../AccountNameEnumerationResultsHandler.java | 3 +- ...ontainerNameEnumerationResultsHandler.java | 3 +- .../config/AzureStorageParserModule.java | 1 + .../config/AzureStorageRestClientModule.java | 3 +- .../storage/domain/AzureStorageError.java | 3 +- .../azure/storage/domain/BoundedSet.java | 3 +- .../domain/internal/BoundedHashSet.java | 3 +- .../filters/SharedKeyLiteAuthentication.java | 3 +- .../AzureStorageClientErrorRetryHandler.java | 3 +- .../ParseAzureStorageErrorFromXmlContent.java | 3 +- .../azure/storage/options/CreateOptions.java | 3 +- .../azure/storage/options/ListOptions.java | 3 +- .../storage/queue/AzureQueueAsyncClient.java | 3 +- .../azure/storage/queue/AzureQueueClient.java | 3 +- .../queue/binders/BindToXmlStringPayload.java | 3 +- .../storage/queue/domain/QueueMessage.java | 3 +- .../storage/queue/domain/QueueMetadata.java | 3 +- .../storage/queue/options/GetOptions.java | 3 +- .../queue/options/PutMessageOptions.java | 3 +- .../AccountNameEnumerationResultsHandler.java | 3 +- .../queue/xml/QueueMessagesListHandler.java | 3 +- .../reference/AzureStorageHeaders.java | 3 +- .../azure/storage/util/AzureStorageUtils.java | 3 +- .../azure/storage/xml/ErrorHandler.java | 3 +- .../storage/ProvidersInPropertiesTest.java | 3 +- .../blob/AzureBlobAsyncClientTest.java | 3 +- .../storage/blob/AzureBlobClientLiveTest.java | 3 +- .../binders/BindAzureBlobToPayloadTest.java | 19 ++++++ .../config/AzureBlobStoreModuleTest.java | 3 +- .../ListBlobsOptionsToListOptions.java | 3 +- .../ResourceToListBlobsResponse.java | 3 +- ...AzureBlobContainerIntegrationLiveTest.java | 3 +- .../AzureBlobContainerLiveTest.java | 3 +- ...BlobInputStreamMapIntegrationLiveTest.java | 3 +- .../AzureBlobIntegrationLiveTest.java | 3 +- .../integration/AzureBlobLiveTest.java | 3 +- .../AzureBlobMapIntegrationLiveTest.java | 3 +- .../AzureBlobServiceIntegrationLiveTest.java | 3 +- .../integration/AzureBlobTestInitializer.java | 3 +- .../options/CreateContainerOptionsTest.java | 3 +- .../blob/options/ListBlobsOptionsTest.java | 3 +- .../ContainerNameValidatorTest.java | 2 +- ...ountNameEnumerationResultsHandlerTest.java | 3 +- ...inerNameEnumerationResultsHandlerTest.java | 3 +- .../AzureStorageRestClientModuleTest.java | 3 +- .../SharedKeyLiteAuthenticationTest.java | 3 +- .../storage/options/CreateOptionsTest.java | 3 +- .../storage/options/ListOptionsTest.java | 3 +- .../queue/AzureQueueAsyncClientTest.java | 3 +- .../queue/AzureQueueClientLiveTest.java | 3 +- .../storage/queue/options/GetOptionsTest.java | 3 +- ...ountNameEnumerationResultsHandlerTest.java | 3 +- .../xml/QueueMessagesListHandlerTest.java | 3 +- .../azure/storage/xml/ErrorHandlerTest.java | 3 +- blobstore/pom.xml | 2 +- .../main/clojure/org/jclouds/blobstore.clj | 35 +++++------ .../org/jclouds/blobstore/AsyncBlobStore.java | 3 +- .../java/org/jclouds/blobstore/BlobMap.java | 3 +- .../java/org/jclouds/blobstore/BlobStore.java | 3 +- .../jclouds/blobstore/BlobStoreContext.java | 3 +- .../blobstore/BlobStoreContextBuilder.java | 3 +- .../blobstore/BlobStoreContextFactory.java | 3 +- .../blobstore/ContainerNotFoundException.java | 3 +- .../org/jclouds/blobstore/InputStreamMap.java | 3 +- .../blobstore/KeyAlreadyExistsException.java | 3 +- .../blobstore/KeyNotFoundException.java | 3 +- .../org/jclouds/blobstore/ListableMap.java | 3 +- .../blobstore/TransientAsyncBlobStore.java | 3 +- .../TransientBlobStoreContextBuilder.java | 3 +- .../TransientBlobStorePropertiesBuilder.java | 19 ++++++ .../blobstore/attr/BlobCapabilities.java | 3 +- .../blobstore/attr/BlobCapability.java | 3 +- .../org/jclouds/blobstore/attr/BlobScope.java | 3 +- .../jclouds/blobstore/attr/BlobScopes.java | 3 +- .../org/jclouds/blobstore/attr/Charge.java | 3 +- .../org/jclouds/blobstore/attr/Charges.java | 3 +- .../blobstore/attr/ConsistencyModel.java | 3 +- .../blobstore/attr/ContainerCapabilities.java | 3 +- .../blobstore/attr/ContainerCapability.java | 3 +- .../blobstore/attr/ContainerVisibilities.java | 3 +- .../blobstore/attr/ContainerVisibility.java | 3 +- .../blobstore/attr/FolderCapability.java | 3 +- .../binders/BindBlobToMultipartForm.java | 3 +- .../binders/BindMapToHeadersWithPrefix.java | 3 +- .../BindUserMetadataToHeadersWithPrefix.java | 3 +- .../blobstore/config/BlobStoreMapModule.java | 3 +- .../config/BlobStoreObjectModule.java | 3 +- .../blobstore/config/TransientBlobStore.java | 26 ++++----- .../TransientBlobStoreContextModule.java | 19 ++++++ .../config/TransientBlobStoreModule.java | 3 +- .../org/jclouds/blobstore/domain/Blob.java | 3 +- .../blobstore/domain/BlobMetadata.java | 3 +- .../blobstore/domain/MutableBlobMetadata.java | 3 +- .../domain/MutableStorageMetadata.java | 3 +- .../org/jclouds/blobstore/domain/PageSet.java | 3 +- .../blobstore/domain/StorageMetadata.java | 3 +- .../jclouds/blobstore/domain/StorageType.java | 3 +- .../blobstore/domain/internal/BlobImpl.java | 3 +- .../domain/internal/BlobMetadataImpl.java | 3 +- .../DelegatingMutableBlobMetadata.java | 3 +- .../internal/MutableBlobMetadataImpl.java | 3 +- .../internal/MutableStorageMetadataImpl.java | 3 +- .../domain/internal/PageSetImpl.java | 3 +- .../domain/internal/StorageMetadataImpl.java | 3 +- .../jclouds/blobstore/functions/BlobName.java | 3 +- .../functions/BlobToHttpGetOptions.java | 3 +- .../functions/ClearAndDeleteIfNotEmpty.java | 3 +- .../HttpGetOptionsListToGetOptions.java | 3 +- .../blobstore/functions/ObjectMD5.java | 3 +- .../ParseBlobFromHeadersAndHttpContent.java | 3 +- ...ParseSystemAndUserMetadataFromHeaders.java | 3 +- .../functions/PrefixToResourceMetadata.java | 3 +- ...etadataToRelativePathResourceMetadata.java | 3 +- .../ReturnFalseOnContainerNotFound.java | 3 +- .../functions/ReturnFalseOnKeyNotFound.java | 3 +- .../ReturnNullOnContainerNotFound.java | 3 +- .../functions/ReturnNullOnKeyNotFound.java | 3 +- .../ThrowContainerNotFoundOn404.java | 3 +- .../functions/ThrowKeyNotFoundOn404.java | 3 +- .../internal/BaseAsyncBlobStore.java | 3 +- .../blobstore/internal/BaseBlobMap.java | 3 +- .../blobstore/internal/BaseBlobStore.java | 3 +- .../blobstore/internal/BlobMapImpl.java | 3 +- .../internal/BlobRuntimeException.java | 3 +- .../internal/BlobStoreContextImpl.java | 3 +- .../internal/InputStreamMapImpl.java | 3 +- .../jclouds/blobstore/options/GetOptions.java | 3 +- .../options/ListContainerOptions.java | 3 +- .../blobstore/options/ListOptions.java | 3 +- .../reference/BlobStoreConstants.java | 3 +- .../blobstore/reference/package-info.java | 3 +- .../strategy/ClearContainerStrategy.java | 3 +- .../blobstore/strategy/ClearListStrategy.java | 3 +- .../strategy/ContainsValueInListStrategy.java | 3 +- .../blobstore/strategy/CountListStrategy.java | 3 +- .../strategy/DeleteDirectoryStrategy.java | 3 +- .../strategy/GetBlobsInListStrategy.java | 3 +- .../strategy/GetDirectoryStrategy.java | 3 +- .../IfDirectoryReturnNameStrategy.java | 3 +- .../strategy/ListBlobsInContainer.java | 3 +- .../strategy/ListContainerStrategy.java | 3 +- .../blobstore/strategy/MkdirStrategy.java | 3 +- .../blobstore/strategy/PutBlobsStrategy.java | 3 +- .../internal/ConcatenateContainerLists.java | 3 +- .../internal/CountBlobTypeInList.java | 3 +- .../internal/DeleteAllKeysInList.java | 3 +- .../strategy/internal/FetchBlobMetadata.java | 3 +- .../strategy/internal/FindMD5InList.java | 3 +- .../GetAllBlobsInListAndRetryOnFailure.java | 3 +- ...ListContainerAndRecurseThroughFolders.java | 3 +- .../internal/MarkerFileMkdirStrategy.java | 3 +- .../MarkersDeleteDirectoryStrategy.java | 3 +- .../internal/MarkersGetDirectoryStrategy.java | 3 +- .../MarkersIfDirectoryReturnNameStrategy.java | 3 +- .../internal/PutBlobsStrategyImpl.java | 3 +- .../blobstore/util/BlobStoreUtils.java | 3 +- .../org/jclouds/blobstore/util/BlobUtils.java | 3 +- .../util/internal/BlobUtilsImpl.java | 3 +- .../clojure/org/jclouds/blobstore_test.clj | 35 +++++------ .../BlobStoreContextFactoryTest.java | 3 +- .../binders/BindBlobToMultipartFormTest.java | 3 +- ...ataToRelativePathResourceMetadataTest.java | 3 +- ...arseBlobFromHeadersAndHttpContentTest.java | 3 +- ...eSystemAndUserMetadataFromHeadersTest.java | 3 +- .../TransientBlobIntegrationTest.java | 3 +- .../TransientBlobMapIntegrationTest.java | 3 +- .../TransientBlobStoreTestInitializer.java | 3 +- .../TransientContainerIntegrationTest.java | 3 +- ...ransientInputStreamMapIntegrationTest.java | 3 +- .../TransientServiceIntegrationTest.java | 3 +- .../internal/BaseBlobIntegrationTest.java | 3 +- .../internal/BaseBlobLiveTest.java | 3 +- .../internal/BaseBlobMapIntegrationTest.java | 3 +- .../BaseBlobStoreIntegrationTest.java | 3 +- .../BaseContainerIntegrationTest.java | 3 +- .../internal/BaseContainerLiveTest.java | 3 +- .../BaseInputStreamMapIntegrationTest.java | 3 +- .../internal/BaseMapIntegrationTest.java | 3 +- .../internal/BaseServiceIntegrationTest.java | 3 +- .../internal/BaseTestInitializer.java | 3 +- .../blobstore/internal/BaseBlobMapTest.java | 3 +- .../blobstore/options/GetOptionsTest.java | 3 +- .../blobstore/options/ListOptionsTest.java | 3 +- .../blobstore/util/BlobStoreUtilsTest.java | 3 +- boxdotnet/pom.xml | 2 +- .../boxdotnet/BoxDotNetAsyncClient.java | 24 ++++---- .../jclouds/boxdotnet/BoxDotNetClient.java | 26 ++++----- .../boxdotnet/BoxDotNetContextBuilder.java | 24 ++++---- .../boxdotnet/BoxDotNetPropertiesBuilder.java | 24 ++++---- .../config/BoxDotNetRestClientModule.java | 26 +-------- .../handlers/BoxDotNetErrorHandler.java | 3 +- .../boxdotnet/BoxDotNetAsyncClientTest.java | 24 ++++---- .../boxdotnet/BoxDotNetClientLiveTest.java | 24 ++++---- .../src/main/clojure/org/jclouds/chef.clj | 35 +++++------ .../org/jclouds/chef/ChefAsyncClient.java | 24 ++++---- .../java/org/jclouds/chef/ChefClient.java | 24 +------- .../java/org/jclouds/chef/ChefContext.java | 1 + .../org/jclouds/chef/ChefContextBuilder.java | 1 + .../org/jclouds/chef/ChefContextFactory.java | 19 ++++++ .../jclouds/chef/ChefPropertiesBuilder.java | 24 ++++---- .../java/org/jclouds/chef/ChefService.java | 19 ++++++ .../binders/BindChecksumsToJsonPayload.java | 24 ++++---- .../binders/BindClientnameToJsonPayload.java | 24 ++++---- ...BindGenerateKeyForClientToJsonPayload.java | 24 ++++---- .../binders/BindIsCompletedToJsonPayload.java | 24 ++++---- .../chef/binders/BindNameToJsonPayload.java | 24 ++++---- .../jclouds/chef/binders/DatabagItemId.java | 1 + .../org/jclouds/chef/binders/NodeName.java | 1 + .../org/jclouds/chef/binders/RoleName.java | 1 + .../chef/config/BaseChefRestClientModule.java | 1 + .../jclouds/chef/config/ChefParserModule.java | 1 + .../chef/config/ChefRestClientModule.java | 24 +------- .../org/jclouds/chef/domain/Attribute.java | 24 ++++---- .../jclouds/chef/domain/ChecksumStatus.java | 1 + .../java/org/jclouds/chef/domain/Client.java | 24 ++++---- .../jclouds/chef/domain/CookbookVersion.java | 1 + .../org/jclouds/chef/domain/DatabagItem.java | 24 ++++---- .../org/jclouds/chef/domain/Metadata.java | 1 + .../java/org/jclouds/chef/domain/Node.java | 1 + .../org/jclouds/chef/domain/Resource.java | 1 + .../java/org/jclouds/chef/domain/Role.java | 1 + .../java/org/jclouds/chef/domain/Sandbox.java | 1 + .../org/jclouds/chef/domain/SearchResult.java | 1 + .../jclouds/chef/domain/UploadSandbox.java | 1 + .../chef/filters/SignedHeaderAuth.java | 24 ++++---- .../ParseErrorFromJsonOrReturnBody.java | 24 ++++---- .../chef/functions/ParseKeySetFromJson.java | 24 +------- .../functions/ParseSearchClientsFromJson.java | 24 +------- .../functions/ParseSearchDatabagFromJson.java | 24 +------- .../functions/ParseSearchNodesFromJson.java | 24 +------- .../functions/ParseSearchResultFromJson.java | 24 +------- .../functions/ParseSearchRolesFromJson.java | 24 +------- .../chef/handlers/ChefErrorHandler.java | 1 + .../internal/BaseChefPropertiesBuilder.java | 24 ++++---- .../chef/internal/BaseChefService.java | 19 ++++++ .../chef/internal/ChefContextImpl.java | 1 + .../jclouds/chef/reference/ChefConstants.java | 24 +------- .../strategy/CleanupStaleNodesAndClients.java | 1 + ...ateNodeAndPopulateAutomaticAttributes.java | 1 + .../chef/strategy/DeleteAllNodesInList.java | 1 + .../org/jclouds/chef/strategy/GetNodes.java | 1 + .../UpdateAutomaticAttributesOnNode.java | 1 + .../CleanupStaleNodesAndClientsImpl.java | 1 + ...odeAndPopulateAutomaticAttributesImpl.java | 1 + .../internal/DeleteAllNodesInListImpl.java | 1 + .../chef/strategy/internal/GetNodesImpl.java | 1 + .../UpdateAutomaticAttributesOnNodeImpl.java | 1 + .../java/org/jclouds/chef/util/ChefUtils.java | 1 + .../main/java/org/jclouds/ohai/Automatic.java | 1 + .../org/jclouds/ohai/AutomaticSupplier.java | 1 + .../org/jclouds/ohai/OhaiContextBuilder.java | 1 + .../jclouds/ohai/config/ConfiguresOhai.java | 19 ++++++ .../jclouds/ohai/config/JMXOhaiModule.java | 1 + .../org/jclouds/ohai/config/OhaiModule.java | 1 + .../ohai/config/multibindings/Element.java | 19 ++++++ .../ohai/config/multibindings/MapBinder.java | 19 ++++++ .../config/multibindings/Multibinder.java | 6 +- .../config/multibindings/RealElement.java | 19 ++++++ .../config/multibindings/package-info.java | 7 ++- .../ohai/functions/ByteArrayToMacAddress.java | 1 + .../ohai/functions/MapSetToMultimap.java | 1 + .../jclouds/ohai/functions/NestSlashKeys.java | 1 + .../ohai/suppliers/UptimeSecondsSupplier.java | 1 + .../jclouds/chef/BaseChefClientLiveTest.java | 46 +++------------ .../org/jclouds/chef/ChefAsyncClientTest.java | 24 ++++---- .../org/jclouds/chef/ChefClientLiveTest.java | 24 ++++---- .../chef/ProvidersInPropertiesTest.java | 1 + .../BindHexEncodedMD5sToJsonPayloadTest.java | 24 ++++---- .../chef/filters/SignedHeaderAuthTest.java | 24 ++++---- .../functions/ParseClientFromJsonTest.java | 19 ++++++ .../ParseCookbookVersionFromJsonTest.java | 19 ++++++ .../ParseDataBagItemFromJsonTest.java | 19 ++++++ .../ParseErrorFromJsonOrReturnBodyTest.java | 24 ++++---- .../functions/ParseKeySetFromJsonTest.java | 19 ++++++ .../chef/functions/ParseNodeFromJsonTest.java | 19 ++++++ .../functions/ParseSandboxFromJsonTest.java | 19 ++++++ .../ParseUploadSandboxFromJsonTest.java | 19 ++++++ .../ChefClientErrorRetryHandlerTest.java | 19 ++++++ .../internal/BaseChefStrategyLiveTest.java | 24 ++++---- ...eanupStaleNodesAndClientsImplLiveTest.java | 24 ++++---- ...pulateAutomaticAttributesImplLiveTest.java | 24 ++++---- ...ndPopulateAutomaticAttributesImplTest.java | 24 ++++---- ...eAllClientsAndNodesInListImplLiveTest.java | 24 ++++---- .../internal/GetNodesImplLiveTest.java | 24 ++++---- ...AutomaticAttributesOnNodeImplLiveTest.java | 24 ++++---- ...dateAutomaticAttributesOnNodeImplTest.java | 24 ++++---- .../org/jclouds/chef/util/ChefUtilsTest.java | 24 ++++---- .../java/org/jclouds/ohai/config/JMXTest.java | 24 ++++---- .../jclouds/ohai/config/OhaiModuleTest.java | 24 ++++---- .../functions/ByteArrayToMacAddressTest.java | 24 ++++---- .../ohai/functions/NestSlashKeysTest.java | 24 ++++---- .../servlet/ChefRegistrationListener.java | 1 + .../functions/InitParamsToProperties.java | 1 + .../servlet/config/ServletOhaiModule.java | 1 + .../suppliers/ServletContextInfoSupplier.java | 1 + .../suppliers/ServletContextSupplier.java | 1 + .../ServletContextInfoSupplierTest.java | 1 + compute/pom.xml | 2 +- .../src/main/clojure/org/jclouds/compute.clj | 35 +++++------ .../org/jclouds/compute/ComputeService.java | 3 +- .../compute/ComputeServiceContext.java | 3 +- .../compute/ComputeServiceContextBuilder.java | 3 +- .../compute/ComputeServiceContextFactory.java | 3 +- .../jclouds/compute/LoadBalancerService.java | 3 +- .../jclouds/compute/RunNodesException.java | 3 +- .../compute/RunScriptOnNodesException.java | 3 +- .../main/java/org/jclouds/compute/Utils.java | 3 +- .../callables/AuthorizeRSAPublicKey.java | 3 +- .../callables/InstallRSAPrivateKey.java | 3 +- .../compute/callables/RunScriptOnNode.java | 2 +- .../config/ComputeServiceTimeoutsModule.java | 3 +- .../compute/config/ResolvesImages.java | 1 + .../jclouds/compute/domain/Architecture.java | 26 ++++----- .../compute/domain/ComputeMetadata.java | 3 +- .../jclouds/compute/domain/ComputeType.java | 3 +- .../org/jclouds/compute/domain/Image.java | 26 ++++----- .../org/jclouds/compute/domain/LoginType.java | 3 +- .../jclouds/compute/domain/NodeMetadata.java | 3 +- .../org/jclouds/compute/domain/NodeState.java | 3 +- .../org/jclouds/compute/domain/OsFamily.java | 26 ++++----- .../java/org/jclouds/compute/domain/Size.java | 26 ++++----- .../org/jclouds/compute/domain/Template.java | 3 +- .../compute/domain/TemplateBuilder.java | 3 +- .../domain/internal/ComputeMetadataImpl.java | 3 +- .../compute/domain/internal/ImageImpl.java | 26 ++++----- .../domain/internal/NodeMetadataImpl.java | 3 +- .../compute/domain/internal/SizeImpl.java | 3 +- .../compute/domain/internal/TemplateImpl.java | 26 ++++----- .../compute/internal/BaseComputeService.java | 26 ++++----- .../internal/BaseLoadBalancerService.java | 26 ++++----- .../internal/ComputeServiceContextImpl.java | 2 +- .../compute/internal/TemplateBuilderImpl.java | 3 +- .../jclouds/compute/internal/UtilsImpl.java | 3 +- .../compute/options/RunScriptOptions.java | 1 + .../compute/options/TemplateOptions.java | 3 +- .../compute/predicates/ImagePredicates.java | 1 + .../compute/predicates/NodePredicates.java | 1 + .../compute/predicates/NodeRunning.java | 19 ++++++ .../compute/predicates/NodeTerminated.java | 19 ++++++ .../predicates/ScriptStatusReturnsZero.java | 3 +- .../reference/ComputeServiceConstants.java | 3 +- .../strategy/AddNodeWithTagStrategy.java | 2 +- .../strategy/DestroyLoadBalancerStrategy.java | 2 +- .../compute/strategy/DestroyNodeStrategy.java | 2 +- .../strategy/GetNodeMetadataStrategy.java | 2 +- .../compute/strategy/ListNodesStrategy.java | 2 +- .../strategy/LoadBalanceNodesStrategy.java | 2 +- ...faultLoginCredentialsForImageStrategy.java | 1 + .../compute/strategy/RebootNodeStrategy.java | 2 +- .../strategy/RunNodesAndAddToSetStrategy.java | 2 +- ...agIntoNameRunNodesAndAddToSetStrategy.java | 2 +- .../strategy/impl/ReturnNullCredentials.java | 19 ++++++ .../StubComputeServiceContextBuilder.java | 3 +- .../StubComputeServicePropertiesBuilder.java | 3 +- .../StubComputeServiceClientModule.java | 26 ++++----- .../StubComputeServiceContextModule.java | 3 +- .../compute/util/ComputeServiceUtils.java | 3 +- .../jclouds/compute/util/ComputeUtils.java | 3 +- .../org/jclouds/ssh/ConfiguresSshClient.java | 3 +- .../java/org/jclouds/ssh/ExecResponse.java | 3 +- .../main/java/org/jclouds/ssh/SshClient.java | 3 +- .../java/org/jclouds/ssh/SshException.java | 3 +- .../test/clojure/org/jclouds/compute_test.clj | 35 +++++------ .../compute/BaseComputeServiceLiveTest.java | 3 +- .../BaseLoadBalancerServiceLiveTest.java | 3 +- .../StubComputeServiceIntegrationTest.java | 3 +- .../internal/TemplateBuilderImplTest.java | 3 +- .../compute/options/TemplateOptionsTest.java | 3 +- .../compute/util/ComputeServiceUtilsTest.java | 3 +- core/pom.xml | 2 +- core/src/main/clojure/org/jclouds/core.clj | 35 +++++------ .../java/com/google/gson/ExposedEscaper.java | 1 + .../google/gson/JcloudsCompactFormatter.java | 8 ++- .../com/google/gson/JcloudsTreeNavigator.java | 7 ++- .../java/com/google/gson/JsonLiteral.java | 3 +- .../pem/PKCS1EncodedPublicKeySpec.java | 1 + core/src/main/java/org/jclouds/Constants.java | 5 +- .../java/org/jclouds/PropertiesBuilder.java | 3 +- .../jclouds/concurrent/DynamicExecutors.java | 28 ++++----- .../concurrent/DynamicThreadPoolExecutor.java | 19 ++++++ .../ExceptionParsingListenableFuture.java | 3 +- .../jclouds/concurrent/FutureIterables.java | 3 +- .../java/org/jclouds/concurrent/Futures.java | 1 + .../org/jclouds/concurrent/MoreExecutors.java | 1 + .../RetryOnTimeOutExceptionSupplier.java | 3 +- .../jclouds/concurrent/SingleThreaded.java | 3 +- .../java/org/jclouds/concurrent/Timeout.java | 3 +- .../config/ConfiguresExecutorService.java | 3 +- .../config/ExecutorServiceModule.java | 3 +- .../concurrent/internal/SyncProxy.java | 3 +- .../main/java/org/jclouds/crypto/Crypto.java | 3 +- .../org/jclouds/crypto/CryptoStreams.java | 1 + .../main/java/org/jclouds/crypto/Pems.java | 1 + .../java/org/jclouds/date/DateService.java | 3 +- .../main/java/org/jclouds/date/TimeStamp.java | 3 +- .../internal/SimpleDateFormatDateService.java | 3 +- .../java/org/jclouds/domain/Credentials.java | 3 +- .../java/org/jclouds/domain/JsonBall.java | 3 +- .../java/org/jclouds/domain/Location.java | 26 ++++----- .../org/jclouds/domain/LocationScope.java | 3 +- .../domain/MutableResourceMetadata.java | 2 +- .../org/jclouds/domain/ResourceMetadata.java | 3 +- .../jclouds/domain/internal/LocationImpl.java | 3 +- .../internal/MutableResourceMetadataImpl.java | 3 +- .../domain/internal/ResourceMetadataImpl.java | 3 +- .../jclouds/encryption/internal/Base64.java | 3 +- .../encryption/internal/JCECrypto.java | 3 +- .../ExceptionToValueOrPropagate.java | 3 +- .../java/org/jclouds/http/HttpCommand.java | 3 +- .../http/HttpCommandExecutorService.java | 3 +- .../jclouds/http/HttpCommandRendezvous.java | 3 +- .../org/jclouds/http/HttpErrorHandler.java | 3 +- .../java/org/jclouds/http/HttpException.java | 3 +- .../java/org/jclouds/http/HttpMessage.java | 3 +- .../java/org/jclouds/http/HttpRequest.java | 3 +- .../org/jclouds/http/HttpRequestFilter.java | 3 +- .../java/org/jclouds/http/HttpResponse.java | 3 +- .../jclouds/http/HttpResponseException.java | 3 +- .../org/jclouds/http/HttpRetryHandler.java | 3 +- .../main/java/org/jclouds/http/HttpUtils.java | 3 +- .../jclouds/http/IOExceptionRetryHandler.java | 3 +- .../java/org/jclouds/http/RequiresHttp.java | 3 +- .../jclouds/http/TransformingHttpCommand.java | 3 +- ...ransformingHttpCommandExecutorService.java | 3 +- ...formingHttpCommandExecutorServiceImpl.java | 3 +- .../http/TransformingHttpCommandImpl.java | 3 +- .../jclouds/http/annotation/ClientError.java | 3 +- .../jclouds/http/annotation/Redirection.java | 3 +- .../jclouds/http/annotation/ServerError.java | 3 +- .../ConfiguresHttpCommandExecutorService.java | 3 +- ...vaUrlHttpCommandExecutorServiceModule.java | 3 +- .../http/filters/BasicAuthentication.java | 3 +- .../functions/ParseContentMD5FromHeaders.java | 3 +- .../http/functions/ParseETagHeader.java | 3 +- .../org/jclouds/http/functions/ParseJson.java | 3 +- .../org/jclouds/http/functions/ParseSax.java | 3 +- ...ParseURIFromListOrLocationHeaderIf20x.java | 3 +- .../functions/ReleasePayloadAndReturn.java | 3 +- .../http/functions/ReturnFalseOn404.java | 3 +- .../http/functions/ReturnInputStream.java | 3 +- .../http/functions/ReturnStringIf2xx.java | 3 +- .../http/functions/ReturnTrueIf2xx.java | 3 +- .../http/functions/ReturnTrueOn404.java | 3 +- .../http/functions/UnwrapOnlyJsonValue.java | 3 +- .../functions/config/SaxParserModule.java | 3 +- .../handlers/BackoffLimitedRetryHandler.java | 3 +- ...oseContentAndSetExceptionErrorHandler.java | 3 +- .../http/handlers/DelegatingErrorHandler.java | 3 +- .../http/handlers/DelegatingRetryHandler.java | 3 +- .../handlers/RedirectionRetryHandler.java | 3 +- .../BaseHttpCommandExecutorService.java | 3 +- .../org/jclouds/http/internal/HttpWire.java | 3 +- .../JavaUrlHttpCommandExecutorService.java | 3 +- .../http/internal/PayloadEnclosingImpl.java | 3 +- .../jclouds/http/internal/SignatureWire.java | 3 +- .../http/options/BaseHttpRequestOptions.java | 3 +- .../org/jclouds/http/options/GetOptions.java | 3 +- .../http/options/HttpRequestOptions.java | 3 +- .../org/jclouds/http/pool/PoolConstants.java | 3 +- .../org/jclouds/internal/ClassMethodArgs.java | 3 +- .../java/org/jclouds/io/InputSuppliers.java | 19 ++++++ .../src/main/java/org/jclouds/io/Payload.java | 3 +- .../java/org/jclouds/io/PayloadEnclosing.java | 3 +- .../main/java/org/jclouds/io/Payloads.java | 3 +- .../src/main/java/org/jclouds/io/WriteTo.java | 1 + .../io/payloads/BaseCipherPayload.java | 1 + .../org/jclouds/io/payloads/BasePayload.java | 3 +- .../jclouds/io/payloads/ByteArrayPayload.java | 3 +- .../io/payloads/DelegatingPayload.java | 3 +- .../org/jclouds/io/payloads/FilePayload.java | 3 +- .../io/payloads/InputStreamPayload.java | 3 +- .../jclouds/io/payloads/MultipartForm.java | 3 +- .../java/org/jclouds/io/payloads/Part.java | 3 +- .../io/payloads/RSADecryptingPayload.java | 1 + .../io/payloads/RSAEncryptingPayload.java | 1 + .../jclouds/io/payloads/StreamingPayload.java | 1 + .../jclouds/io/payloads/StringPayload.java | 3 +- .../io/payloads/UrlEncodedFormPayload.java | 3 +- core/src/main/java/org/jclouds/json/Json.java | 3 +- .../org/jclouds/json/config/GsonModule.java | 3 +- .../jclouds/json/internal/GsonWrapper.java | 3 +- .../org/jclouds/lifecycle/BaseLifeCycle.java | 3 +- .../java/org/jclouds/lifecycle/Closer.java | 3 +- .../java/org/jclouds/lifecycle/LifeCycle.java | 3 +- .../lifecycle/config/LifeCycleModule.java | 3 +- .../java/org/jclouds/logging/BaseLogger.java | 3 +- .../org/jclouds/logging/ConsoleLogger.java | 3 +- .../main/java/org/jclouds/logging/Logger.java | 3 +- .../java/org/jclouds/logging/NullLogger.java | 3 +- .../BindLoggersAnnotatedWithResource.java | 3 +- .../logging/config/ConsoleLoggingModule.java | 3 +- .../jclouds/logging/config/LoggingModule.java | 3 +- .../logging/config/NullLoggingModule.java | 3 +- .../org/jclouds/logging/internal/Wire.java | 3 +- .../org/jclouds/logging/jdk/JDKLogger.java | 3 +- .../logging/jdk/config/JDKLoggingModule.java | 3 +- .../main/java/org/jclouds/net/IPSocket.java | 3 +- .../predicates/RetryablePredicate.java | 3 +- .../org/jclouds/predicates/SocketOpen.java | 19 ++++++ .../predicates/SocketOpenUnsupported.java | 19 ++++++ .../org/jclouds/predicates/Validator.java | 34 +++++------ .../validators/AllLowerCaseValidator.java | 3 +- .../validators/DnsNameValidator.java | 1 + .../org/jclouds/rest/AsyncClientFactory.java | 3 +- .../jclouds/rest/AuthorizationException.java | 3 +- .../main/java/org/jclouds/rest/Binder.java | 3 +- .../jclouds/rest/ConfiguresRestClient.java | 3 +- .../jclouds/rest/ConfiguresRestContext.java | 3 +- .../org/jclouds/rest/HttpAsyncClient.java | 19 ++++++ .../java/org/jclouds/rest/HttpClient.java | 3 +- .../org/jclouds/rest/InputParamValidator.java | 3 +- .../org/jclouds/rest/InvocationContext.java | 3 +- .../main/java/org/jclouds/rest/MapBinder.java | 3 +- .../java/org/jclouds/rest/RequestSigner.java | 3 +- .../rest/ResourceNotFoundException.java | 3 +- .../java/org/jclouds/rest/RestContext.java | 3 +- .../org/jclouds/rest/RestContextBuilder.java | 3 +- .../org/jclouds/rest/RestContextFactory.java | 3 +- .../src/main/java/org/jclouds/rest/Utils.java | 3 +- .../org/jclouds/rest/annotations/Api.java | 3 +- .../jclouds/rest/annotations/ApiVersion.java | 3 +- .../jclouds/rest/annotations/BinderParam.java | 3 +- .../jclouds/rest/annotations/Credential.java | 3 +- .../jclouds/rest/annotations/Delegate.java | 3 +- .../jclouds/rest/annotations/Endpoint.java | 3 +- .../rest/annotations/EndpointParam.java | 3 +- .../rest/annotations/ExceptionParser.java | 3 +- .../jclouds/rest/annotations/FormParams.java | 3 +- .../org/jclouds/rest/annotations/Headers.java | 3 +- .../jclouds/rest/annotations/Identity.java | 3 +- .../jclouds/rest/annotations/MapBinder.java | 3 +- .../rest/annotations/MapPayloadParam.java | 3 +- .../rest/annotations/MatrixParams.java | 3 +- .../annotations/OverrideRequestFilters.java | 3 +- .../jclouds/rest/annotations/ParamParser.java | 3 +- .../rest/annotations/ParamValidators.java | 3 +- .../jclouds/rest/annotations/PartParam.java | 3 +- .../jclouds/rest/annotations/Provider.java | 3 +- .../jclouds/rest/annotations/QueryParams.java | 3 +- .../rest/annotations/RequestFilters.java | 3 +- .../rest/annotations/ResponseParser.java | 3 +- .../rest/annotations/SkipEncoding.java | 3 +- .../org/jclouds/rest/annotations/Unwrap.java | 3 +- .../jclouds/rest/annotations/VirtualHost.java | 3 +- .../rest/annotations/XMLResponseParser.java | 3 +- .../rest/binders/BindAsHostPrefix.java | 3 +- .../rest/binders/BindMapToMatrixParams.java | 3 +- .../rest/binders/BindToJsonPayload.java | 3 +- .../rest/binders/BindToStringPayload.java | 3 +- .../rest/config/AsyncClientProvider.java | 3 +- .../org/jclouds/rest/config/BinderUtils.java | 3 +- .../jclouds/rest/config/ClientProvider.java | 3 +- .../rest/config/CreateClientForCaller.java | 3 +- .../jclouds/rest/config/RestClientModule.java | 3 +- .../org/jclouds/rest/config/RestModule.java | 3 +- .../MapHttp4xxCodesToExceptions.java | 3 +- .../ReturnEmptySetOnNotFoundOr404.java | 3 +- .../functions/ReturnFalseOnNotFoundOr404.java | 3 +- .../functions/ReturnNullOnNotFoundOr404.java | 3 +- .../functions/ReturnVoidOnNotFoundOr404.java | 3 +- .../rest/internal/AsyncRestClientProxy.java | 3 +- .../rest/internal/GeneratedHttpRequest.java | 3 +- .../internal/RestAnnotationProcessor.java | 3 +- .../rest/internal/RestContextImpl.java | 3 +- .../org/jclouds/rest/internal/UtilsImpl.java | 3 +- ...utNotOnAuthorizationExceptionSupplier.java | 1 + .../org/jclouds/util/InputStreamChain.java | 3 +- .../main/java/org/jclouds/util/Patterns.java | 2 +- .../src/main/java/org/jclouds/util/Utils.java | 3 +- .../test/clojure/org/jclouds/core_test.clj | 35 +++++------ .../java/org/jclouds/PerformanceTest.java | 3 +- .../concurrent/FutureExceptionParserTest.java | 3 +- .../concurrent/FutureIterablesTest.java | 1 + .../FuturesComposePerformanceTest.java | 1 + .../concurrent/FuturesTestingUtils.java | 1 + .../RetryOnTimeOutExceptionSupplierTest.java | 3 +- .../config/ExecutorServiceModuleTest.java | 3 +- .../concurrent/internal/SyncProxyTest.java | 3 +- .../org/jclouds/crypto/CryptoStreamsTest.java | 1 + .../java/org/jclouds/crypto/PemsTest.java | 1 + .../org/jclouds/date/DateServiceTest.java | 3 +- .../org/jclouds/domain/CredentialsTest.java | 3 +- .../java/org/jclouds/domain/JsonBallTest.java | 3 +- .../http/BackoffLimitedRetryJavaTest.java | 3 +- ...CommandExecutorServiceIntegrationTest.java | 3 +- .../http/BaseHttpErrorHandlerTest.java | 3 +- .../java/org/jclouds/http/BaseJettyTest.java | 3 +- .../http/HttpPropertiesBuilderTest.java | 3 +- .../org/jclouds/http/HttpRequestTest.java | 3 +- .../http/IntegrationTestAsyncClient.java | 3 +- .../jclouds/http/IntegrationTestClient.java | 3 +- ...CommandExecutorServiceIntegrationTest.java | 3 +- .../http/TransformingHttpCommandImplTest.java | 3 +- .../http/filters/BasicAuthenticationTest.java | 3 +- .../http/functions/BaseHandlerTest.java | 3 +- ...eURIFromListOrLocationHeaderIf20xTest.java | 3 +- .../http/functions/ReturnStringIf200Test.java | 3 +- .../BackoffLimitedRetryHandlerTest.java | 3 +- .../handlers/DelegatingErrorHandlerTest.java | 3 +- .../jclouds/http/internal/WireLiveTest.java | 3 +- .../org/jclouds/http/internal/WireTest.java | 3 +- .../jclouds/http/options/GetOptionsTest.java | 3 +- .../test/java/org/jclouds/io/CryptoTest.java | 3 +- .../io/payloads/MultipartFormTest.java | 3 +- .../lifecycle/config/LifeCycleModuleTest.java | 3 +- .../BindLoggersAnnotatedWithResourceTest.java | 3 +- .../predicates/RetryablePredicateTest.java | 3 +- .../org/jclouds/rest/BaseRestClientTest.java | 3 +- .../jclouds/rest/InputParamValidatorTest.java | 3 +- .../java/org/jclouds/rest/RestClientTest.java | 3 +- .../jclouds/rest/RestContextBuilderTest.java | 3 +- .../jclouds/rest/RestContextFactoryTest.java | 3 +- .../binders/BindMapToMatrixParamsTest.java | 3 +- .../MapHttp4xxCodesToExceptionsTest.java | 3 +- .../internal/RestAnnotationProcessorTest.java | 3 +- .../test/testng/UnitTestStatusListener.java | 3 +- .../java/org/jclouds/util/HttpUtilsTest.java | 3 +- .../java/org/jclouds/util/PatternsTest.java | 3 +- .../test/java/org/jclouds/util/UtilsTest.java | 3 +- demos/antjruby/build.xml | 3 +- demos/gae-tweetstore-spring/README.txt | 3 +- demos/gae-tweetstore-spring/pom.xml | 2 +- .../src/main/appengine/appengine-web.xml | 3 +- .../src/main/appengine/logging.properties | 2 +- .../demo/tweetstore/config/LoggingConfig.java | 3 +- .../config/SpringServletConfig.java | 3 +- .../controller/AddTweetsController.java | 3 +- .../controller/StoreTweetsController.java | 3 +- .../tweetstore/domain/StoredTweetStatus.java | 3 +- .../functions/KeyToStoredTweetStatus.java | 3 +- .../ServiceToStoredTweetStatuses.java | 3 +- .../reference/TweetStoreConstants.java | 3 +- .../webapp/WEB-INF/dispatcher-servlet.xml | 2 +- .../src/main/webapp/WEB-INF/queue.xml | 3 +- .../src/main/webapp/WEB-INF/web.xml | 3 +- .../src/main/webapp/index.jsp | 3 +- .../src/main/webapp/tweets.jsp | 3 +- .../controller/AddTweetsControllerTest.java | 3 +- .../controller/StoreTweetsControllerTest.java | 3 +- .../functions/KeyToStoredTweetStatusTest.java | 3 +- .../ServiceToStoredTweetStatusesTest.java | 3 +- .../integration/GoogleDevServer.java | 3 +- .../integration/TweetStoreLiveTest.java | 3 +- demos/gae-tweetstore/README.txt | 3 +- demos/gae-tweetstore/pom.xml | 2 +- .../src/main/appengine/appengine-web.xml | 3 +- .../src/main/appengine/logging.properties | 33 +---------- .../tweetstore/config/GuiceServletConfig.java | 3 +- .../controller/AddTweetsController.java | 3 +- .../controller/StoreTweetsController.java | 3 +- .../tweetstore/domain/StoredTweetStatus.java | 3 +- .../functions/KeyToStoredTweetStatus.java | 3 +- .../ServiceToStoredTweetStatuses.java | 3 +- .../reference/TweetStoreConstants.java | 3 +- .../src/main/webapp/WEB-INF/queue.xml | 3 +- .../src/main/webapp/WEB-INF/web.xml | 3 +- .../gae-tweetstore/src/main/webapp/index.jsp | 3 +- .../gae-tweetstore/src/main/webapp/tweets.jsp | 3 +- .../controller/AddTweetsControllerTest.java | 3 +- .../controller/StoreTweetsControllerTest.java | 3 +- .../functions/KeyToStoredTweetStatusTest.java | 3 +- .../ServiceToStoredTweetStatusesTest.java | 3 +- .../integration/GoogleDevServer.java | 3 +- .../integration/TweetStoreLiveTest.java | 3 +- demos/pom.xml | 2 +- demos/speedtest-azurequeue/README.txt | 3 +- demos/speedtest-azurequeue/pom.xml | 2 +- .../jclouds/azure/azurequeue/SpeedTest.java | 3 +- extensions/apachehc/pom.xml | 2 +- .../ApacheHCHttpCommandExecutorService.java | 2 +- .../jclouds/http/apachehc/ApacheHCUtils.java | 3 +- ...cheHCHttpCommandExecutorServiceModule.java | 3 +- ...pacheHCHttpCommandExecutorServiceTest.java | 3 +- extensions/bouncycastle/README.txt | 3 +- extensions/bouncycastle/pom.xml | 2 +- .../bouncycastle/BouncyCastleCrypto.java | 3 +- .../config/BouncyCastleCryptoModule.java | 3 +- .../bouncycastle/BouncyCastleCryptoTest.java | 3 +- extensions/enterprise/README.txt | 3 +- extensions/enterprise/pom.xml | 2 +- .../config/EnterpriseConfigurationModule.java | 3 +- .../EnterpriseConfigurationModuleTest.java | 3 +- extensions/gae/README.txt | 3 +- extensions/gae/pom.xml | 2 +- .../AsyncGaeHttpCommandExecutorService.java | 3 +- .../org/jclouds/gae/ConvertToGaeRequest.java | 3 +- .../jclouds/gae/ConvertToJcloudsResponse.java | 3 +- .../gae/GaeHttpCommandExecutorService.java | 3 +- ...yncGoogleAppEngineConfigurationModule.java | 3 +- .../GoogleAppEngineConfigurationModule.java | 3 +- ...CommandExecutorServiceIntegrationTest.java | 3 +- .../jclouds/gae/ConvertToGaeRequestTest.java | 3 +- .../gae/ConvertToJcloudsResponseTest.java | 3 +- ...xecutorServiceIntegrationTestDisabled.java | 3 +- ...oogleAppEngineConfigurationModuleTest.java | 3 +- extensions/joda/README.txt | 3 +- extensions/joda/pom.xml | 2 +- .../jclouds/date/joda/JodaDateService.java | 3 +- .../joda/config/JodaDateServiceModule.java | 3 +- .../date/joda/JodaDateServiceTest.java | 3 +- extensions/log4j/README.txt | 3 +- extensions/log4j/pom.xml | 2 +- .../jclouds/logging/log4j/Log4JLogger.java | 3 +- .../log4j/config/Log4JLoggingModule.java | 3 +- .../log4j/config/Log4JLoggingModuleTest.java | 3 +- extensions/pom.xml | 2 +- extensions/ssh/jsch/README.txt | 3 +- extensions/ssh/jsch/pom.xml | 2 +- .../org/jclouds/ssh/jsch/JschSshClient.java | 3 +- .../ssh/jsch/config/JschSshClientModule.java | 3 +- .../predicates/InetSocketAddressConnect.java | 3 +- .../ssh/jsch/JschSshClientLiveTest.java | 3 +- .../jclouds/ssh/jsch/JschSshClientTest.java | 3 +- .../jsch/config/JschSshClientModuleTest.java | 3 +- extensions/ssh/pom.xml | 2 +- .../org/jclouds/gogrid/GoGridAsyncClient.java | 24 ++++---- .../java/org/jclouds/gogrid/GoGridClient.java | 24 ++++---- .../jclouds/gogrid/GoGridContextBuilder.java | 24 ++++---- .../gogrid/GoGridPropertiesBuilder.java | 24 ++++---- .../gogrid/GoGridResponseException.java | 24 ++++---- .../gogrid/binders/BindIdsToQueryParams.java | 24 ++++---- .../binders/BindNamesToQueryParams.java | 24 ++++---- ...ObjectNameToGetJobsRequestQueryParams.java | 1 + .../BindRealIpPortPairsToQueryParams.java | 1 + .../BindVirtualIpPortPairToQueryParams.java | 1 + .../GoGridComputeServiceContextModule.java | 1 + .../functions/ServerToNodeMetadata.java | 1 + .../GoGridAddNodeWithTagStrategy.java | 1 + .../gogrid/config/DateSecondsAdapter.java | 24 ++++---- .../gogrid/config/GoGridParserModule.java | 1 + .../gogrid/config/GoGridRestClientModule.java | 1 + .../internal/GoGridResolveImagesModule.java | 1 + .../jclouds/gogrid/domain/BillingToken.java | 24 ++++---- .../org/jclouds/gogrid/domain/Customer.java | 24 ++++---- .../java/org/jclouds/gogrid/domain/Ip.java | 24 ++++---- .../org/jclouds/gogrid/domain/IpPortPair.java | 1 + .../org/jclouds/gogrid/domain/IpState.java | 1 + .../org/jclouds/gogrid/domain/IpType.java | 1 + .../java/org/jclouds/gogrid/domain/Job.java | 1 + .../jclouds/gogrid/domain/JobProperties.java | 1 + .../org/jclouds/gogrid/domain/JobState.java | 1 + .../jclouds/gogrid/domain/LoadBalancer.java | 1 + .../jclouds/gogrid/domain/LoadBalancerOs.java | 1 + .../domain/LoadBalancerPersistenceType.java | 1 + .../gogrid/domain/LoadBalancerState.java | 1 + .../gogrid/domain/LoadBalancerType.java | 1 + .../org/jclouds/gogrid/domain/ObjectType.java | 1 + .../org/jclouds/gogrid/domain/Option.java | 24 ++++---- .../jclouds/gogrid/domain/PowerCommand.java | 24 ++++---- .../org/jclouds/gogrid/domain/Server.java | 24 ++++---- .../jclouds/gogrid/domain/ServerImage.java | 24 ++++---- .../gogrid/domain/ServerImageState.java | 1 + .../gogrid/domain/ServerImageType.java | 1 + .../jclouds/gogrid/domain/ServerState.java | 24 ++++---- .../gogrid/domain/internal/ErrorResponse.java | 24 ++++---- .../filters/SharedKeyLiteAuthentication.java | 24 ++++---- .../functions/GenericResponseContainer.java | 24 ++++---- .../ParseCredentialsFromJsonResponse.java | 24 ++++---- .../functions/ParseErrorFromJsonResponse.java | 24 ++++---- .../functions/ParseImageFromJsonResponse.java | 1 + .../ParseImageListFromJsonResponse.java | 1 + .../ParseIpListFromJsonResponse.java | 1 + .../ParseJobListFromJsonResponse.java | 1 + .../ParseLoadBalancerFromJsonResponse.java | 1 + ...ParseLoadBalancerListFromJsonResponse.java | 1 + .../ParseOptionsFromJsonResponse.java | 1 + .../ParseServerFromJsonResponse.java | 24 ++++---- .../ParseServerListFromJsonResponse.java | 24 ++++---- ...rNameToCredentialsMapFromJsonResponse.java | 1 + .../internal/CustomDeserializers.java | 1 + .../gogrid/handlers/GoGridErrorHandler.java | 24 ++++---- .../jclouds/gogrid/mock/HttpCommandMock.java | 24 ++++---- .../options/AddLoadBalancerOptions.java | 1 + .../gogrid/options/AddServerOptions.java | 24 ++++---- .../gogrid/options/GetImageListOptions.java | 1 + .../gogrid/options/GetIpListOptions.java | 1 + .../gogrid/options/GetJobListOptions.java | 1 + .../gogrid/options/GetServerListOptions.java | 24 ++++---- .../LoadBalancerLatestJobCompleted.java | 1 + .../predicates/ServerLatestJobCompleted.java | 1 + .../gogrid/reference/GoGridConstants.java | 24 ++++---- .../gogrid/reference/GoGridHeaders.java | 24 ++++---- .../gogrid/reference/GoGridQueryParams.java | 24 ++++---- .../gogrid/services/GridImageAsyncClient.java | 19 ++++++ .../gogrid/services/GridImageClient.java | 19 ++++++ .../gogrid/services/GridIpAsyncClient.java | 1 + .../jclouds/gogrid/services/GridIpClient.java | 1 + .../gogrid/services/GridJobAsyncClient.java | 1 + .../gogrid/services/GridJobClient.java | 1 + .../services/GridLoadBalancerAsyncClient.java | 1 + .../services/GridLoadBalancerClient.java | 1 + .../services/GridServerAsyncClient.java | 24 ++++---- .../gogrid/services/GridServerClient.java | 24 ++++---- .../org/jclouds/gogrid/util/GoGridUtils.java | 24 ++++---- .../jclouds/gogrid/GoGridAsyncClientTest.java | 19 ++++++ .../gogrid/GoGridComputeServiceLiveTest.java | 1 + .../org/jclouds/gogrid/GoGridLiveTest.java | 1 + .../gogrid/ProvidersInPropertiesTest.java | 19 ++++++ .../binders/BindIdsToQueryParamsTest.java | 1 + .../binders/BindNamesToQueryParamsTest.java | 1 + ...GoGridComputeServiceContextModuleTest.java | 1 + .../functions/ServerToNodeMetadataTest.java | 19 ++++++ .../ParseCredentialsFromJsonResponseTest.java | 1 + .../ParseErrorFromJsonResponseTest.java | 24 ++++---- .../ParseJobsFromJsonResponseTest.java | 1 + ...arseLoadBalancersFromJsonResponseTest.java | 1 + ...eToCredentialsMapFromJsonResponseTest.java | 1 + .../ParseServersFromJsonResponseTest.java | 24 ++++---- .../handlers/GoGridErrorHandlerTest.java | 24 ++++---- .../gogrid/options/AddServerOptionsTest.java | 1 + .../ServerLatestJobCompletedTest.java | 1 + .../services/BaseGoGridAsyncClientTest.java | 1 + .../services/GridImageAsyncClientTest.java | 1 + .../services/GridIpAsyncClientTest.java | 1 + .../services/GridJobAsyncClientTest.java | 1 + .../GridLoadBalancerAsyncClientTest.java | 1 + .../services/GridServerAsyncClientTest.java | 24 +------- ibmdev/pom.xml | 2 +- .../ibmdev/IBMDeveloperCloudAsyncClient.java | 24 ++++---- .../ibmdev/IBMDeveloperCloudClient.java | 26 +-------- .../IBMDeveloperCloudContextBuilder.java | 24 ++++---- .../IBMDeveloperCloudPropertiesBuilder.java | 24 ++++---- ...loperCloudComputeServiceContextModule.java | 1 + .../functions/InstanceToNodeMetadata.java | 3 +- .../config/IBMDeveloperCloudParserModule.java | 3 +- .../IBMDeveloperCloudRestClientModule.java | 3 +- .../org/jclouds/ibmdev/domain/Address.java | 9 +-- .../java/org/jclouds/ibmdev/domain/Image.java | 9 +-- .../org/jclouds/ibmdev/domain/Instance.java | 9 +-- .../jclouds/ibmdev/domain/InstanceType.java | 9 +-- .../java/org/jclouds/ibmdev/domain/Key.java | 9 +-- .../org/jclouds/ibmdev/domain/Location.java | 9 +-- .../org/jclouds/ibmdev/domain/Offering.java | 9 +-- .../java/org/jclouds/ibmdev/domain/Price.java | 9 +-- .../ibmdev/domain/StorageOffering.java | 9 +-- .../org/jclouds/ibmdev/domain/Volume.java | 9 +-- .../functions/GetFirstInstanceInList.java | 3 +- .../functions/ParseAddressFromJson.java | 3 +- .../functions/ParseAddressesFromJson.java | 26 +-------- .../ParseExpirationTimeFromJson.java | 3 +- .../ibmdev/functions/ParseImageFromJson.java | 26 +-------- .../ibmdev/functions/ParseImagesFromJson.java | 26 +-------- .../functions/ParseInstanceFromJson.java | 26 +-------- .../functions/ParseInstancesFromJson.java | 26 +-------- .../ibmdev/functions/ParseKeysFromJson.java | 26 +-------- .../ibmdev/functions/ParseLongFromDate.java | 3 +- .../jclouds/ibmdev/functions/ParseUtils.java | 3 +- .../ibmdev/functions/ParseVolumeFromJson.java | 3 +- .../functions/ParseVolumesFromJson.java | 3 +- .../IBMDeveloperCloudErrorHandler.java | 3 +- .../ibmdev/options/CreateInstanceOptions.java | 3 +- .../options/RestartInstanceOptions.java | 3 +- .../ibmdev/predicates/AddressFree.java | 3 +- .../ibmdev/predicates/InstanceActive.java | 3 +- .../predicates/InstanceActiveOrFailed.java | 3 +- .../predicates/InstanceRemovedOrNotFound.java | 3 +- .../ibmdev/predicates/VolumeUnmounted.java | 3 +- .../reference/IBMDeveloperCloudConstants.java | 26 +-------- .../jclouds/ibmdev/xml/LocationHandler.java | 3 +- .../jclouds/ibmdev/xml/LocationsHandler.java | 3 +- .../IBMDeveloperCloudAsyncClientTest.java | 24 ++++---- .../IBMDeveloperCloudClientLiveTest.java | 24 ++++---- .../ibmdev/ProvidersInPropertiesTest.java | 19 ++++++ ...erCloudComputeServiceLiveTestDisabled.java | 1 + ...rCloudComputeServiceContextModuleTest.java | 3 +- .../ibmdev/xml/LocationHandlerTest.java | 3 +- .../ibmdev/xml/LocationsHandlerTest.java | 3 +- mezeo/pcs2/core/README.txt | 3 +- mezeo/pcs2/core/pom.xml | 2 +- .../jclouds/mezeo/pcs2/PCSAsyncClient.java | 3 +- .../org/jclouds/mezeo/pcs2/PCSClient.java | 3 +- .../mezeo/pcs2/PCSCloudAsyncClient.java | 3 +- .../jclouds/mezeo/pcs2/PCSContextBuilder.java | 3 +- .../BindContainerNameToXmlPayload.java | 3 +- .../binders/BindFileInfoToXmlPayload.java | 3 +- .../binders/BindPCSFileToMultipartForm.java | 3 +- .../blobstore/functions/BlobToFileInfo.java | 3 +- .../blobstore/functions/BlobToPCSFile.java | 3 +- .../functions/FileInfoToBlobMetadata.java | 3 +- .../blobstore/functions/PCSFileToBlob.java | 3 +- .../mezeo/pcs2/config/PCSObjectModule.java | 3 +- .../pcs2/config/PCSRestClientModule.java | 3 +- .../mezeo/pcs2/domain/ContainerInfo.java | 3 +- .../mezeo/pcs2/domain/ContainerList.java | 3 +- .../jclouds/mezeo/pcs2/domain/FileInfo.java | 3 +- .../pcs2/domain/FileInfoWithMetadata.java | 3 +- .../mezeo/pcs2/domain/MutableFileInfo.java | 3 +- .../pcs2/domain/MutableResourceInfo.java | 3 +- .../jclouds/mezeo/pcs2/domain/PCSFile.java | 3 +- .../mezeo/pcs2/domain/ResourceInfo.java | 3 +- .../domain/internal/ContainerInfoImpl.java | 3 +- .../domain/internal/ContainerListImpl.java | 3 +- .../pcs2/domain/internal/FileInfoImpl.java | 3 +- .../internal/FileInfoWithMetadataImpl.java | 3 +- .../domain/internal/MutableFileInfoImpl.java | 3 +- .../internal/MutableResourceInfoImpl.java | 3 +- .../pcs2/domain/internal/PCSFileImpl.java | 3 +- .../domain/internal/ResourceInfoImpl.java | 3 +- .../mezeo/pcs2/endpoints/Contacts.java | 3 +- .../mezeo/pcs2/endpoints/Metacontainers.java | 3 +- .../mezeo/pcs2/endpoints/Projects.java | 3 +- .../mezeo/pcs2/endpoints/Recyclebin.java | 3 +- .../mezeo/pcs2/endpoints/RootContainer.java | 3 +- .../jclouds/mezeo/pcs2/endpoints/Shares.java | 3 +- .../jclouds/mezeo/pcs2/endpoints/Tags.java | 3 +- .../jclouds/mezeo/pcs2/endpoints/WebDAV.java | 3 +- .../functions/AddMetadataItemIntoMap.java | 3 +- .../ReturnFalseIfContainerNotFound.java | 3 +- .../ReturnTrueIfContainerAlreadyExists.java | 3 +- .../handlers/PCSClientErrorRetryHandler.java | 3 +- .../mezeo/pcs2/options/PutBlockOptions.java | 3 +- .../mezeo/pcs2/xml/CloudXlinkHandler.java | 3 +- .../mezeo/pcs2/xml/ContainerHandler.java | 3 +- .../jclouds/mezeo/pcs2/xml/FileHandler.java | 3 +- .../mezeo/pcs2/PCSAsyncClientTest.java | 3 +- .../jclouds/mezeo/pcs2/PCSClientLiveTest.java | 3 +- .../org/jclouds/mezeo/pcs2/PCSCloudTest.java | 3 +- .../mezeo/pcs2/ProvidersInPropertiesTest.java | 3 +- .../BindContainerNameToXmlPayloadTest.java | 3 +- .../binders/BindFileInfoToXmlPayloadTest.java | 3 +- .../functions/AddMetadataAndReturnIdTest.java | 3 +- .../AssembleBlobFromBlobMetadataCallTest.java | 3 +- .../pcs2/internal/StubPCSAsyncClient.java | 3 +- .../pcs2/options/PutBlockOptionsTest.java | 3 +- .../mezeo/pcs2/xml/CloudXlinkHanderTest.java | 3 +- .../mezeo/pcs2/xml/ContainerHandlerTest.java | 3 +- .../pcs2/xml/FileMetadataHandlerTest.java | 3 +- mezeo/pcs2/pom.xml | 2 +- mezeo/pom.xml | 2 +- nirvanix/pom.xml | 2 +- nirvanix/sdn/core/README.txt | 3 +- nirvanix/sdn/core/pom.xml | 2 +- .../jclouds/nirvanix/sdn/SDNAsyncClient.java | 3 +- .../nirvanix/sdn/SDNAuthAsyncClient.java | 3 +- .../org/jclouds/nirvanix/sdn/SDNClient.java | 3 +- .../nirvanix/sdn/SDNContextBuilder.java | 3 +- .../nirvanix/sdn/SDNPropertiesBuilder.java | 3 +- .../jclouds/nirvanix/sdn/SessionToken.java | 3 +- .../binders/BindMetadataToQueryParams.java | 3 +- .../sdn/config/SDNAuthRestClientModule.java | 3 +- .../sdn/config/SDNRestClientModule.java | 3 +- .../nirvanix/sdn/domain/UploadInfo.java | 3 +- .../sdn/filters/AddSessionTokenToRequest.java | 3 +- .../filters/InsertUserContextIntoPath.java | 3 +- .../ParseMetadataFromJsonResponse.java | 3 +- .../ParseSessionTokenFromJsonResponse.java | 3 +- .../ParseUploadInfoFromJsonResponse.java | 3 +- .../nirvanix/sdn/reference/SDNConstants.java | 3 +- .../sdn/reference/SDNQueryParams.java | 3 +- .../sdn/ProvidersInPropertiesTest.java | 3 +- .../nirvanix/sdn/SDNAsyncClientTest.java | 3 +- .../nirvanix/sdn/SDNAuthAsyncClientTest.java | 3 +- .../sdn/SDNAuthenticationLiveTest.java | 3 +- .../nirvanix/sdn/SDNClientLiveTest.java | 3 +- .../BindMetadataToQueryParamsTest.java | 3 +- .../filters/AddSessionTokenToRequestTest.java | 3 +- .../InsertUserContextIntoPathTest.java | 3 +- .../ParseMetadataFromJsonResponseTest.java | 3 +- ...ParseSessionTokenFromJsonResponseTest.java | 3 +- .../ParseUploadInfoFromJsonResponseTest.java | 3 +- nirvanix/sdn/pom.xml | 2 +- opscodeplatform/pom.xml | 2 +- .../OpscodePlatformAsyncClient.java | 24 ++++---- .../OpscodePlatformClient.java | 24 ++++---- .../OpscodePlatformContext.java | 1 + .../OpscodePlatformContextBuilder.java | 1 + .../OpscodePlatformPropertiesBuilder.java | 24 ++++---- .../config/OrganizationName.java | 1 + .../opscodeplatform/config/Username.java | 1 + .../opscodeplatform/domain/Organization.java | 1 + .../jclouds/opscodeplatform/domain/User.java | 1 + .../OpscodePlatformRestClientModule.java | 26 +-------- .../internal/OpscodePlatformContextImpl.java | 1 + .../OpscodePlatformAsyncClientTest.java | 24 ++++---- .../OpscodePlatformClientLiveTest.java | 24 ++++---- .../ProvidersInPropertiesTest.java | 19 ++++++ .../ParseOrganizationFromJsonTest.java | 1 + .../functions/ParseUserFromJsonTest.java | 19 ++++++ pom.xml | 16 ++--- project/pom.xml | 2 +- rackspace/README.txt | 3 +- rackspace/pom.xml | 2 +- .../org/jclouds/rackspace/Authentication.java | 3 +- .../org/jclouds/rackspace/CloudFiles.java | 3 +- .../org/jclouds/rackspace/CloudFilesCDN.java | 3 +- .../org/jclouds/rackspace/CloudServers.java | 3 +- .../rackspace/RackspaceAuthAsyncClient.java | 3 +- .../rackspace/RackspacePropertiesBuilder.java | 3 +- .../cloudfiles/CloudFilesAsyncClient.java | 3 +- .../cloudfiles/CloudFilesClient.java | 3 +- .../cloudfiles/CloudFilesContextBuilder.java | 3 +- .../CloudFilesPropertiesBuilder.java | 3 +- .../binders/BindCFObjectToPayload.java | 3 +- .../blobstore/CloudFilesAsyncBlobStore.java | 3 +- .../blobstore/CloudFilesBlobStore.java | 3 +- .../CloudFilesBlobStoreContextModule.java | 3 +- ...ontainerOptionsToListContainerOptions.java | 3 +- .../blobstore/functions/BlobToObject.java | 3 +- .../functions/BlobToObjectGetOptions.java | 3 +- .../functions/ContainerToResourceList.java | 3 +- .../ContainerToResourceMetadata.java | 3 +- .../blobstore/functions/ObjectToBlob.java | 3 +- .../functions/ObjectToBlobMetadata.java | 3 +- .../functions/ResourceToObjectInfo.java | 3 +- .../cloudfiles/config/CFObjectModule.java | 3 +- .../config/CloudFilesRestClientModule.java | 3 +- .../cloudfiles/domain/AccountMetadata.java | 3 +- .../rackspace/cloudfiles/domain/CFObject.java | 3 +- .../domain/ContainerCDNMetadata.java | 3 +- .../cloudfiles/domain/ContainerMetadata.java | 3 +- .../domain/MutableObjectInfoWithMetadata.java | 3 +- .../cloudfiles/domain/ObjectInfo.java | 3 +- .../domain/internal/CFObjectImpl.java | 3 +- ...legatingMutableObjectInfoWithMetadata.java | 3 +- .../MutableObjectInfoWithMetadataImpl.java | 3 +- .../domain/internal/ObjectInfoImpl.java | 3 +- .../cloudfiles/functions/ObjectName.java | 3 +- ...rseAccountMetadataResponseFromHeaders.java | 3 +- .../functions/ParseCdnUriFromHeaders.java | 3 +- .../ParseContainerCDNMetadataFromHeaders.java | 3 +- .../ParseObjectFromHeadersAndHttpContent.java | 3 +- .../functions/ParseObjectInfoFromHeaders.java | 3 +- .../ParseObjectInfoListFromJsonResponse.java | 3 +- .../functions/ReturnTrueOn404FalseOn409.java | 3 +- .../ParseCloudFilesErrorFromHttpResponse.java | 19 ++++++ .../options/ListCdnContainerOptions.java | 3 +- .../options/ListContainerOptions.java | 3 +- .../rackspace/cloudfiles/package-info.java | 3 +- .../reference/CloudFilesConstants.java | 3 +- .../reference/CloudFilesHeaders.java | 3 +- .../cloudfiles/reference/package-info.java | 3 +- .../cloudservers/CloudServersAsyncClient.java | 3 +- .../cloudservers/CloudServersClient.java | 3 +- .../CloudServersContextBuilder.java | 3 +- .../binders/BindAdminPassToJsonPayload.java | 3 +- .../BindBackupScheduleToJsonPayload.java | 3 +- .../BindConfirmResizeToJsonPayload.java | 3 +- .../binders/BindCreateImageToJsonPayload.java | 3 +- .../binders/BindRebootTypeToJsonPayload.java | 3 +- .../BindResizeFlavorToJsonPayload.java | 3 +- .../BindRevertResizeToJsonPayload.java | 3 +- .../binders/BindServerNameToJsonPayload.java | 3 +- .../BindSharedIpGroupToJsonPayload.java | 3 +- ...oudServersComputeServiceContextModule.java | 3 +- .../functions/ServerToNodeMetadata.java | 1 + .../config/CloudServersRestClientModule.java | 3 +- .../cloudservers/domain/AbsoluteLimit.java | 3 +- .../rackspace/cloudservers/domain/Action.java | 3 +- .../cloudservers/domain/Addresses.java | 3 +- .../cloudservers/domain/BackupSchedule.java | 3 +- .../cloudservers/domain/DailyBackup.java | 3 +- .../rackspace/cloudservers/domain/Flavor.java | 3 +- .../rackspace/cloudservers/domain/Image.java | 3 +- .../cloudservers/domain/ImageStatus.java | 3 +- .../rackspace/cloudservers/domain/Limits.java | 3 +- .../cloudservers/domain/RateLimit.java | 3 +- .../cloudservers/domain/RateLimitUnit.java | 3 +- .../cloudservers/domain/RebootType.java | 3 +- .../rackspace/cloudservers/domain/Server.java | 3 +- .../cloudservers/domain/ServerStatus.java | 3 +- .../cloudservers/domain/ShareIp.java | 3 +- .../cloudservers/domain/SharedIpGroup.java | 3 +- .../cloudservers/domain/Version.java | 3 +- .../cloudservers/domain/VersionStatus.java | 3 +- .../cloudservers/domain/WeeklyBackup.java | 3 +- ...arseCloudServersErrorFromHttpResponse.java | 19 ++++++ .../options/CreateServerOptions.java | 3 +- .../options/CreateSharedIpGroupOptions.java | 3 +- .../cloudservers/options/ListOptions.java | 3 +- .../options/RebuildServerOptions.java | 3 +- .../cloudservers/predicates/ServerActive.java | 19 ++++++ .../predicates/ServerDeleted.java | 19 ++++++ .../RackspaceAuthenticationRestModule.java | 3 +- .../config/RackspaceLocationsModule.java | 3 +- .../config/RackspaceParserModule.java | 3 +- .../rackspace/filters/AddTimestampQuery.java | 3 +- .../filters/AuthenticateRequest.java | 3 +- ...arseAuthenticationResponseFromHeaders.java | 3 +- .../rackspace/options/BaseListOptions.java | 3 +- .../rackspace/reference/RackspaceHeaders.java | 3 +- .../rackspace/reference/package-info.java | 3 +- .../rackspace/ProvidersInPropertiesTest.java | 3 +- .../RackspaceAuthAsyncClientTest.java | 3 +- .../RackspaceAuthenticationLiveTest.java | 3 +- .../cloudfiles/CloudFilesClientLiveTest.java | 3 +- .../binders/BindCFObjectToPayloadTest.java | 3 +- ...ptionsToBlobStoreListContainerOptions.java | 3 +- .../functions/ResourceToObjectList.java | 3 +- .../CloudFilesBlobIntegrationLiveTest.java | 3 +- .../integration/CloudFilesBlobLiveTest.java | 3 +- .../CloudFilesBlobMapIntegrationLiveTest.java | 3 +- ...loudFilesContainerIntegrationLiveTest.java | 3 +- .../CloudFilesContainerLiveTest.java | 3 +- ...ilesInputStreamMapIntegrationLiveTest.java | 3 +- .../CloudFilesServiceIntegrationLiveTest.java | 3 +- .../CloudFilesTestInitializer.java | 3 +- ...rseObjectInfoListFromJsonResponseTest.java | 3 +- ...erCDNMetadataListFromJsonResponseTest.java | 3 +- ...arseContainerListFromJsonResponseTest.java | 3 +- .../ParseObjectInfoFromHeadersTest.java | 3 +- .../internal/StubCloudFilesAsyncClient.java | 3 +- .../options/ListContainerOptionsTest.java | 3 +- .../CloudServersAsyncClientTest.java | 3 +- .../CloudServersClientLiveTest.java | 3 +- ...ckspaceAuthenticationRestClientModule.java | 26 ++++----- .../BindAdminPassToJsonPayloadTest.java | 3 +- .../BindCreateImageToJsonPayloadTest.java | 3 +- .../BindRebootTypeToJsonPayloadTest.java | 3 +- .../BindServerNameToJsonPayloadTest.java | 3 +- .../CloudServersComputeServiceLiveTest.java | 2 +- .../functions/ServerToNodeMetadataTest.java | 19 ++++++ .../cloudservers/domain/ServerTest.java | 3 +- .../ParseAddressesFromJsonResponseTest.java | 3 +- ...rseBackupScheduleFromJsonResponseTest.java | 3 +- .../ParseFlavorFromJsonResponseTest.java | 3 +- .../ParseFlavorListFromJsonResponseTest.java | 3 +- .../ParseImageFromJsonResponseTest.java | 3 +- .../ParseImageListFromJsonResponseTest.java | 3 +- ...seInetAddressListFromJsonResponseTest.java | 3 +- .../ParseServerFromJsonResponseTest.java | 3 +- .../ParseServerListFromJsonResponseTest.java | 3 +- ...arseSharedIpGroupFromJsonResponseTest.java | 3 +- ...SharedIpGroupListFromJsonResponseTest.java | 3 +- .../options/CreateServerOptionsTest.java | 3 +- .../CreateSharedIpGroupOptionsTest.java | 3 +- .../cloudservers/options/ListOptionsTest.java | 3 +- .../options/RebuildServerOptionsTest.java | 3 +- .../filters/AddTimestampQueryTest.java | 3 +- .../options/BaseListOptionsTest.java | 3 +- rimuhosting/README.txt | 3 +- rimuhosting/pom.xml | 2 +- .../miro/RimuHostingAsyncClient.java | 3 +- .../rimuhosting/miro/RimuHostingClient.java | 3 +- .../miro/RimuHostingContextBuilder.java | 3 +- .../miro/RimuHostingPropertiesBuilder.java | 3 +- .../miro/binder/CreateServerOptions.java | 3 +- .../miro/binder/RimuHostingJsonBinder.java | 3 +- .../binder/RimuHostingRebootJsonBinder.java | 3 +- ...imuHostingComputeServiceContextModule.java | 3 +- .../rimuhosting/miro/data/CloneOptions.java | 3 +- .../rimuhosting/miro/data/CreateOptions.java | 3 +- .../rimuhosting/miro/data/IpRequestData.java | 3 +- .../rimuhosting/miro/data/NewServerData.java | 3 +- .../rimuhosting/miro/data/PostData.java | 3 +- .../rimuhosting/miro/domain/BillingData.java | 3 +- .../rimuhosting/miro/domain/DataCenter.java | 3 +- .../miro/domain/DataTransferAllowance.java | 3 +- .../rimuhosting/miro/domain/Image.java | 3 +- .../rimuhosting/miro/domain/IpAddresses.java | 3 +- .../rimuhosting/miro/domain/MetaData.java | 19 ++++++ .../miro/domain/NewServerResponse.java | 3 +- .../rimuhosting/miro/domain/PricingPlan.java | 3 +- .../miro/domain/ResizeResponse.java | 3 +- .../rimuhosting/miro/domain/ResizeResult.java | 3 +- .../rimuhosting/miro/domain/Server.java | 3 +- .../rimuhosting/miro/domain/ServerInfo.java | 3 +- .../miro/domain/ServerParameters.java | 3 +- .../domain/internal/RimuHostingError.java | 3 +- .../domain/internal/RimuHostingResponse.java | 3 +- .../domain/internal/RimuHostingTimestamp.java | 3 +- .../miro/domain/internal/RunningState.java | 3 +- .../miro/domain/internal/ServerType.java | 3 +- .../filters/RimuHostingAuthentication.java | 3 +- .../ParseDestroyResponseFromJsonResponse.java | 3 +- .../ParseImagesFromJsonResponse.java | 3 +- .../ParsePricingPlansFromJsonResponse.java | 3 +- .../functions/ParseRimuHostingException.java | 3 +- .../ParseServerFromJsonResponse.java | 3 +- .../ParseServerInfoFromJsonResponse.java | 3 +- .../ParseServersFromJsonResponse.java | 3 +- .../miro/predicates/ServerDestroyed.java | 19 ++++++ .../miro/predicates/ServerRunning.java | 19 ++++++ .../miro/reference/RimuHostingConstants.java | 3 +- .../miro/ProvidersInPropertiesTest.java | 19 ++++++ .../miro/RimuHostingAsyncClientTest.java | 19 ++++++ .../miro/RimuHostingClientLiveTest.java | 3 +- .../RimuHostingComputeServiceLiveTest.java | 3 +- ...ostingComputeServiceContextModuleTest.java | 1 + .../NingHttpCommandExecutorServiceModule.java | 3 +- .../NingHttpCommandExecutorServiceTest.java | 3 +- scriptbuilder/pom.xml | 2 +- .../org/jclouds/scriptbuilder/EnvBuilder.java | 3 +- .../jclouds/scriptbuilder/InitBuilder.java | 3 +- .../jclouds/scriptbuilder/ScriptBuilder.java | 3 +- .../jclouds/scriptbuilder/domain/Call.java | 3 +- .../scriptbuilder/domain/CreateRunScript.java | 3 +- .../scriptbuilder/domain/InitMetadata.java | 3 +- .../domain/InterpretableStatement.java | 3 +- .../domain/JavaInitMetadata.java | 3 +- .../jclouds/scriptbuilder/domain/Kill.java | 3 +- .../scriptbuilder/domain/OsFamily.java | 3 +- .../scriptbuilder/domain/ShellToken.java | 3 +- .../scriptbuilder/domain/Statement.java | 3 +- .../scriptbuilder/domain/StatementList.java | 3 +- .../scriptbuilder/domain/Statements.java | 3 +- .../domain/StoppableJavaInitMetadata.java | 3 +- .../scriptbuilder/domain/SwitchArg.java | 3 +- .../org/jclouds/scriptbuilder/util/Utils.java | 3 +- .../jclouds/scriptbuilder/EnvBuilderTest.java | 3 +- .../scriptbuilder/InitBuilderTest.java | 3 +- .../scriptbuilder/ScriptBuilderTest.java | 3 +- .../scriptbuilder/domain/CallTest.java | 3 +- .../domain/CreateRunScriptTest.java | 3 +- .../scriptbuilder/domain/ShellTokenTest.java | 3 +- .../domain/StatementListTest.java | 3 +- .../scriptbuilder/domain/SwitchArgTest.java | 3 +- .../jclouds/scriptbuilder/util/UtilsTest.java | 3 +- .../slicehost/SlicehostAsyncClient.java | 1 + .../jclouds/slicehost/SlicehostClient.java | 1 + .../slicehost/SlicehostContextBuilder.java | 1 + .../slicehost/SlicehostPropertiesBuilder.java | 1 + .../binders/BindCreateBackupToXmlPayload.java | 1 + .../binders/BindCreateSliceToXmlPayload.java | 1 + .../SlicehostComputeServiceContextModule.java | 1 + .../functions/SliceToNodeMetadata.java | 1 + .../config/SlicehostRestClientModule.java | 1 + .../org/jclouds/slicehost/domain/Backup.java | 1 + .../org/jclouds/slicehost/domain/Flavor.java | 1 + .../org/jclouds/slicehost/domain/Image.java | 1 + .../org/jclouds/slicehost/domain/Slice.java | 1 + .../slicehost/filters/SlicehostBasic.java | 1 + .../ParseSlicehostErrorFromHttpResponse.java | 19 ++++++ .../slicehost/predicates/SliceActive.java | 19 ++++++ .../slicehost/predicates/SliceTerminated.java | 19 ++++++ .../jclouds/slicehost/xml/BackupHandler.java | 1 + .../jclouds/slicehost/xml/BackupsHandler.java | 1 + .../jclouds/slicehost/xml/ErrorHandler.java | 1 + .../jclouds/slicehost/xml/FlavorHandler.java | 1 + .../jclouds/slicehost/xml/FlavorsHandler.java | 1 + .../jclouds/slicehost/xml/ImageHandler.java | 1 + .../jclouds/slicehost/xml/ImagesHandler.java | 1 + .../jclouds/slicehost/xml/SliceHandler.java | 1 + .../jclouds/slicehost/xml/SlicesHandler.java | 1 + .../slicehost/ProvidersInPropertiesTest.java | 1 + .../slicehost/SlicehostAsyncClientTest.java | 1 + .../slicehost/SlicehostClientLiveTest.java | 1 + ...cehostComputeServiceContextModuleTest.java | 1 + .../slicehost/xml/FlavorHandlerTest.java | 1 + .../slicehost/xml/FlavorsHandlerTest.java | 1 + .../slicehost/xml/SliceHandlerTest.java | 1 + .../slicehost/xml/SlicesHandlerTest.java | 1 + thirdparty/pom.xml | 36 +++++------- tools/antcontrib/pom.xml | 2 +- .../samples/cargooverssh/README.txt | 2 +- .../antcontrib/samples/cargooverssh/build.xml | 4 +- .../samples/cargooverssh/runscript.sh | 19 ++++++ tools/antcontrib/samples/compute/build.xml | 3 +- .../antcontrib/samples/javaoverssh/README.txt | 3 +- .../antcontrib/samples/javaoverssh/build.xml | 3 +- .../samples/javaoverssh/src/TestClass.java | 2 +- .../jclouds/tools/ant/logging/AntLogger.java | 3 +- .../ant/logging/config/AntLoggingModule.java | 3 +- .../ant/taskdefs/compute/ComputeTask.java | 3 +- .../taskdefs/compute/ComputeTaskUtils.java | 26 ++++----- .../ant/taskdefs/compute/NodeElement.java | 3 +- .../tools/ant/taskdefs/sshjava/SSHJava.java | 3 +- .../jclouds/tools/ant/util/SSHExecute.java | 3 +- .../java/org/jclouds/tools/ant/TestClass.java | 2 +- .../ant/taskdefs/sshjava/SSHJavaTest.java | 3 +- tools/getpath/README.txt | 3 +- tools/getpath/pom.xml | 2 +- .../java/org/jclouds/blobstore/GetPath.java | 3 +- .../jclouds/blobstore/GetPathLiveTest.java | 3 +- .../blobstore/ProvidersInPropertiesTest.java | 3 +- tools/pom.xml | 2 +- tools/vfs/README.txt | 3 +- tools/vfs/pom.xml | 2 +- tools/vfs/samples/vfs-ant/README.txt | 3 +- tools/vfs/samples/vfs-ant/build.xml | 3 +- tools/vfs/samples/vfs-ant/log4j.xml | 3 +- .../provider/blobstore/BlobStoreFileName.java | 3 +- .../blobstore/BlobStoreFileNameParser.java | 3 +- .../blobstore/BlobStoreFileObject.java | 3 +- .../blobstore/BlobStoreFileProvider.java | 3 +- .../blobstore/BlobStoreFileSystem.java | 3 +- .../BlobStoreRandomAccessContent.java | 3 +- .../vfs/tools/blobstore/BlobStoreShell.java | 3 +- .../test/BlobStoreProviderTestCase.java | 3 +- .../test/BlobStoreProviderTestSuite.java | 3 +- .../blobstore/test/FileNameTestCase.java | 3 +- twitter/README.txt | 3 +- twitter/pom.xml | 2 +- .../jclouds/twitter/TwitterAsyncClient.java | 3 +- .../org/jclouds/twitter/TwitterClient.java | 3 +- .../org/jclouds/twitter/domain/Location.java | 3 +- .../org/jclouds/twitter/domain/Status.java | 3 +- .../java/org/jclouds/twitter/domain/User.java | 3 +- .../twitter/TwitterAsyncClientTest.java | 3 +- .../twitter/TwitterClientLiveTest.java | 3 +- .../ParseStatusesFromJsonResponseTest.java | 3 +- vcloud/bluelock/README.txt | 3 +- vcloud/bluelock/pom.xml | 2 +- .../BlueLockVCloudContextBuilder.java | 3 +- .../BlueLockVCloudPropertiesBuilder.java | 3 +- .../compute/BlueLockVCloudComputeClient.java | 19 ++++++ ...LockVCloudComputeServiceContextModule.java | 3 +- ...ParseVAppTemplatesInVDCToSizeProvider.java | 19 ++++++ ...efaultLoginCredentialsFromBlueLockFAQ.java | 19 ++++++ .../BlueLockVCloudRestClientModule.java | 3 +- .../BlueLockVCloudClientLiveTest.java | 3 +- .../bluelock/ProvidersInPropertiesTest.java | 3 +- .../VCloudSessionRefreshLiveTest.java | 19 ++++++ .../BlueLockVCloudComputeServiceLiveTest.java | 2 +- ...eVAppTemplatesInVDCToSizeProviderTest.java | 3 +- vcloud/core/README.txt | 3 +- vcloud/core/pom.xml | 2 +- .../org/jclouds/vcloud/VCloudAsyncClient.java | 3 +- .../java/org/jclouds/vcloud/VCloudClient.java | 3 +- .../jclouds/vcloud/VCloudContextBuilder.java | 3 +- .../org/jclouds/vcloud/VCloudMediaType.java | 3 +- .../vcloud/VCloudPropertiesBuilder.java | 3 +- .../java/org/jclouds/vcloud/VCloudToken.java | 3 +- .../BindCloneVAppParamsToXmlPayload.java | 3 +- ...antiateVAppTemplateParamsToXmlPayload.java | 3 +- .../compute/BaseVCloudComputeClient.java | 3 +- .../vcloud/compute/VCloudComputeClient.java | 3 +- .../VCloudComputeServiceContextModule.java | 3 +- .../OrgAndVDCToLocationProvider.java | 3 +- .../config/providers/StaticSizeProvider.java | 3 +- .../config/providers/VAppTemplatesInVDCs.java | 3 +- .../vcloud/compute/domain/VCloudLocation.java | 1 + .../functions/FindLocationForResource.java | 3 +- .../vcloud/compute/functions/GetExtra.java | 3 +- .../functions/ImageForVAppTemplate.java | 3 +- .../functions/ImagesInOrganization.java | 3 +- .../vcloud/compute/functions/ImagesInVDC.java | 3 +- .../functions/VCloudGetNodeMetadata.java | 3 +- ...IdIntoNameRunNodesAndAddToSetStrategy.java | 3 +- .../VCloudAddNodeWithTagStrategy.java | 3 +- .../strategy/VCloudDestroyNodeStrategy.java | 3 +- .../VCloudGetNodeMetadataStrategy.java | 3 +- .../strategy/VCloudListNodesStrategy.java | 3 +- .../strategy/VCloudRebootNodeStrategy.java | 3 +- .../config/BaseVCloudRestClientModule.java | 3 +- .../vcloud/config/VCloudRestClientModule.java | 3 +- .../org/jclouds/vcloud/domain/Capacity.java | 3 +- .../org/jclouds/vcloud/domain/Catalog.java | 3 +- .../jclouds/vcloud/domain/CatalogItem.java | 3 +- .../org/jclouds/vcloud/domain/FenceMode.java | 3 +- .../jclouds/vcloud/domain/FirewallRule.java | 3 +- .../jclouds/vcloud/domain/NamedResource.java | 3 +- .../org/jclouds/vcloud/domain/NatRule.java | 3 +- .../org/jclouds/vcloud/domain/Network.java | 3 +- .../jclouds/vcloud/domain/Organization.java | 3 +- .../java/org/jclouds/vcloud/domain/Quota.java | 3 +- .../vcloud/domain/ResourceAllocation.java | 3 +- .../jclouds/vcloud/domain/ResourceType.java | 3 +- .../java/org/jclouds/vcloud/domain/Task.java | 3 +- .../org/jclouds/vcloud/domain/TaskStatus.java | 3 +- .../org/jclouds/vcloud/domain/TasksList.java | 3 +- .../java/org/jclouds/vcloud/domain/VApp.java | 3 +- .../org/jclouds/vcloud/domain/VAppStatus.java | 3 +- .../jclouds/vcloud/domain/VAppTemplate.java | 3 +- .../java/org/jclouds/vcloud/domain/VDC.java | 3 +- .../jclouds/vcloud/domain/VirtualSystem.java | 3 +- .../vcloud/domain/internal/CatalogImpl.java | 3 +- .../domain/internal/CatalogItemImpl.java | 3 +- .../domain/internal/NamedResourceImpl.java | 3 +- .../vcloud/domain/internal/NetworkImpl.java | 3 +- .../domain/internal/OrganizationImpl.java | 3 +- .../vcloud/domain/internal/TaskImpl.java | 3 +- .../vcloud/domain/internal/TasksListImpl.java | 3 +- .../vcloud/domain/internal/VAppImpl.java | 3 +- .../domain/internal/VAppTemplateImpl.java | 3 +- .../vcloud/domain/internal/VDCImpl.java | 3 +- .../org/jclouds/vcloud/endpoints/Catalog.java | 3 +- .../org/jclouds/vcloud/endpoints/Network.java | 3 +- .../org/jclouds/vcloud/endpoints/Org.java | 3 +- .../jclouds/vcloud/endpoints/TasksList.java | 3 +- .../jclouds/vcloud/endpoints/VCloudApi.java | 3 +- .../jclouds/vcloud/endpoints/VCloudLogin.java | 3 +- .../org/jclouds/vcloud/endpoints/VDC.java | 3 +- .../endpoints/internal/CatalogItemRoot.java | 3 +- .../vcloud/endpoints/internal/VAppRoot.java | 3 +- .../endpoints/internal/VAppTemplateRoot.java | 3 +- .../vcloud/filters/SetVCloudTokenCookie.java | 3 +- .../functions/AllCatalogItemsInCatalog.java | 3 +- .../AllCatalogItemsInOrganization.java | 3 +- .../functions/AllCatalogsInOrganization.java | 3 +- .../functions/AllVDCsInOrganization.java | 3 +- .../vcloud/functions/CatalogIdToUri.java | 3 +- .../OrgNameAndCatalogNameToEndpoint.java | 1 + .../OrgNameAndTasksListNameToEndpoint.java | 1 + .../OrgNameAndVDCNameToEndpoint.java | 1 + .../vcloud/functions/OrgNameToEndpoint.java | 1 + .../functions/OrganizatonsForLocations.java | 3 +- .../ParseLoginResponseFromHeaders.java | 3 +- .../org/jclouds/vcloud/functions/VAppId.java | 3 +- .../jclouds/vcloud/functions/VAppIdToUri.java | 3 +- .../vcloud/functions/VAppTemplateIdToUri.java | 3 +- .../VAppTemplatesForCatalogItems.java | 3 +- .../VAppTemplatesForResourceEntities.java | 3 +- .../vcloud/functions/VDCNameToEndpoint.java | 3 +- .../ParseVCloudErrorFromHttpResponse.java | 3 +- .../internal/VCloudLoginAsyncClient.java | 3 +- .../internal/VCloudVersionsAsyncClient.java | 3 +- .../vcloud/options/CloneVAppOptions.java | 3 +- .../InstantiateVAppTemplateOptions.java | 3 +- .../vcloud/predicates/TaskSuccess.java | 3 +- .../vcloud/predicates/VAppNotFound.java | 3 +- .../vcloud/reference/VCloudConstants.java | 3 +- .../vcloud/reference/package-info.java | 3 +- .../java/org/jclouds/vcloud/util/Utils.java | 3 +- .../jclouds/vcloud/xml/CatalogHandler.java | 3 +- .../vcloud/xml/CatalogItemHandler.java | 3 +- .../jclouds/vcloud/xml/NetworkHandler.java | 3 +- .../org/jclouds/vcloud/xml/OrgHandler.java | 3 +- .../jclouds/vcloud/xml/OrgListHandler.java | 3 +- .../vcloud/xml/ResourceAllocationHandler.java | 3 +- .../vcloud/xml/SupportedVersionsHandler.java | 3 +- .../org/jclouds/vcloud/xml/TaskHandler.java | 3 +- .../jclouds/vcloud/xml/TasksListHandler.java | 3 +- .../org/jclouds/vcloud/xml/VAppHandler.java | 3 +- .../vcloud/xml/VAppTemplateHandler.java | 3 +- .../org/jclouds/vcloud/xml/VDCHandler.java | 3 +- .../vcloud/xml/VirtualSystemHandler.java | 3 +- .../vcloud/ProvidersInPropertiesTest.java | 19 ++++++ .../jclouds/vcloud/VCloudAsyncClientTest.java | 3 +- .../jclouds/vcloud/VCloudClientLiveTest.java | 3 +- .../vcloud/VCloudLoginAsyncClientTest.java | 3 +- .../jclouds/vcloud/VCloudLoginLiveTest.java | 3 +- .../vcloud/VCloudVersionsAsyncClientTest.java | 3 +- .../vcloud/VCloudVersionsLiveTest.java | 3 +- .../BindCloneVAppParamsToXmlPayloadTest.java | 3 +- ...ateVAppTemplateParamsToXmlPayloadTest.java | 3 +- .../compute/VCloudComputeClientLiveTest.java | 3 +- .../compute/VCloudComputeServiceLiveTest.java | 19 ++++++ ...VCloudComputeServiceContextModuleTest.java | 1 + ...toNameRunNodesAndAddToSetStrategyTest.java | 3 +- .../strategy/VCloudListNodesStrategyTest.java | 3 +- .../filters/SetVCloudTokenCookieTest.java | 3 +- .../ParseLoginResponseFromHeadersTest.java | 3 +- .../ParseVCloudErrorFromHttpResponseTest.java | 3 +- .../InstantiateVAppTemplateOptionsTest.java | 3 +- .../vcloud/xml/CatalogHandlerTest.java | 3 +- .../vcloud/xml/CatalogItemHandlerTest.java | 3 +- .../vcloud/xml/NetworkHandlerTest.java | 3 +- .../jclouds/vcloud/xml/OrgHandlerTest.java | 3 +- .../vcloud/xml/OrgListHandlerTest.java | 3 +- .../xml/ResourceAllocationHandlerTest.java | 3 +- .../xml/SupportedVersionsHandlerTest.java | 3 +- .../jclouds/vcloud/xml/TaskHandlerTest.java | 3 +- .../vcloud/xml/TasksListHandlerTest.java | 3 +- .../jclouds/vcloud/xml/VAppHandlerTest.java | 3 +- .../vcloud/xml/VAppTemplateHandlerTest.java | 3 +- .../jclouds/vcloud/xml/VDCHandlerTest.java | 3 +- .../vcloud/xml/VirtualSystemHandlerTest.java | 3 +- vcloud/hostingdotcom/README.txt | 3 +- vcloud/hostingdotcom/pom.xml | 2 +- .../HostingDotComVCloudAsyncClient.java | 3 +- .../HostingDotComVCloudClient.java | 3 +- .../HostingDotComVCloudContextBuilder.java | 3 +- .../HostingDotComVCloudPropertiesBuilder.java | 3 +- .../HostingDotComVCloudComputeClient.java | 19 ++++++ ...tComVCloudComputeServiceContextModule.java | 3 +- .../HostingDotComVCloudRestClientModule.java | 3 +- .../domain/HostingDotComVApp.java | 3 +- .../internal/HostingDotComVAppImpl.java | 3 +- .../xml/HostingDotComVAppHandler.java | 3 +- .../HostingDotComVCloudAsyncClientTest.java | 3 +- .../HostingDotComVCloudClientLiveTest.java | 3 +- .../ProvidersInPropertiesTest.java | 19 ++++++ ...tingDotComVCloudComputeClientLiveTest.java | 3 +- ...ingDotComVCloudComputeServiceLiveTest.java | 2 +- .../xml/HostingDotComVAppHandlerTest.java | 3 +- vcloud/pom.xml | 2 +- vcloud/terremark/README.txt | 3 +- vcloud/terremark/pom.xml | 2 +- .../terremark/TerremarkECloudAsyncClient.java | 3 +- .../terremark/TerremarkECloudClient.java | 3 +- .../TerremarkECloudContextBuilder.java | 3 +- .../terremark/TerremarkECloudMediaType.java | 19 ++++++ .../TerremarkECloudPropertiesBuilder.java | 3 +- .../terremark/TerremarkVCloudAsyncClient.java | 3 +- .../terremark/TerremarkVCloudClient.java | 3 +- .../TerremarkVCloudExpressAsyncClient.java | 3 +- .../TerremarkVCloudExpressClient.java | 3 +- .../TerremarkVCloudExpressContextBuilder.java | 3 +- .../TerremarkVCloudExpressMediaType.java | 19 ++++++ ...rremarkVCloudExpressPropertiesBuilder.java | 3 +- .../terremark/TerremarkVCloudMediaType.java | 19 ++++++ .../TerremarkVCloudPropertiesBuilder.java | 3 +- .../BindAddInternetServiceToXmlPayload.java | 3 +- .../BindAddNodeServiceToXmlPayload.java | 3 +- .../binders/BindCreateKeyToXmlPayload.java | 3 +- .../BindNodeConfigurationToXmlPayload.java | 3 +- .../BindVAppConfigurationToXmlPayload.java | 3 +- ...remarkBindCloneVAppParamsToXmlPayload.java | 3 +- ...antiateVAppTemplateParamsToXmlPayload.java | 3 +- .../compute/TerremarkVCloudComputeClient.java | 3 +- .../TerremarkVCloudComputeService.java | 3 +- ...markVCloudComputeServiceContextModule.java | 3 +- .../config/providers/VAppTemplatesInOrgs.java | 3 +- .../terremark/compute/domain/OrgAndName.java | 3 +- .../functions/CreateUniqueKeyPair.java | 3 +- .../functions/ImagesInOrganization.java | 3 +- .../functions/NodeMetadataToOrgAndName.java | 3 +- .../TerremarkVCloudTemplateOptions.java | 3 +- .../compute/strategy/CleanupOrphanKeys.java | 3 +- ...ewKeyPairUnlessUserSpecifiedOtherwise.java | 3 +- .../compute/strategy/DeleteKeyPair.java | 3 +- ...scriptionToGetDefaultLoginCredentials.java | 3 +- ...IdIntoNameRunNodesAndAddToSetStrategy.java | 3 +- ...erremarkVCloudGetNodeMetadataStrategy.java | 3 +- .../TerremarkECloudRestClientModule.java | 3 +- .../config/TerremarkRestClientModule.java | 26 ++++----- ...erremarkVCloudExpressRestClientModule.java | 3 +- .../domain/CustomizationParameters.java | 3 +- .../terremark/domain/InternetService.java | 3 +- .../vcloud/terremark/domain/IpAddress.java | 3 +- .../vcloud/terremark/domain/KeyPair.java | 3 +- .../jclouds/vcloud/terremark/domain/Node.java | 3 +- .../terremark/domain/NodeConfiguration.java | 3 +- .../vcloud/terremark/domain/Protocol.java | 3 +- .../terremark/domain/PublicIpAddress.java | 3 +- .../domain/TerremarkOrganization.java | 3 +- .../vcloud/terremark/domain/TerremarkVDC.java | 3 +- .../terremark/domain/VAppConfiguration.java | 3 +- .../internal/TerremarkOrganizationImpl.java | 3 +- .../domain/internal/TerremarkVDCImpl.java | 3 +- .../terremark/endpoints/InternetServices.java | 3 +- .../vcloud/terremark/endpoints/KeysList.java | 3 +- .../vcloud/terremark/endpoints/PublicIPs.java | 3 +- .../functions/OrgNameToKeysListEndpoint.java | 19 ++++++ .../ParseTaskFromLocationHeader.java | 3 +- .../ReturnVoidOnDeleteDefaultIp.java | 3 +- ...eTerremarkVCloudErrorFromHttpResponse.java | 19 ++++++ .../options/AddInternetServiceOptions.java | 3 +- .../terremark/options/AddNodeOptions.java | 3 +- ...rremarkInstantiateVAppTemplateOptions.java | 3 +- .../reference/TerremarkConstants.java | 19 ++++++ .../xml/CustomizationParametersHandler.java | 3 +- .../terremark/xml/InternetServiceHandler.java | 3 +- .../xml/InternetServicesHandler.java | 3 +- .../terremark/xml/IpAddressesHandler.java | 3 +- .../terremark/xml/KeyPairByNameHandler.java | 1 + .../vcloud/terremark/xml/KeyPairHandler.java | 3 +- .../vcloud/terremark/xml/KeyPairsHandler.java | 3 +- .../vcloud/terremark/xml/NodeHandler.java | 3 +- .../vcloud/terremark/xml/NodesHandler.java | 3 +- .../terremark/xml/PublicIpAddressHandler.java | 3 +- .../xml/PublicIpAddressesHandler.java | 3 +- .../terremark/xml/TerremarkOrgHandler.java | 3 +- .../terremark/xml/TerremarkVDCHandler.java | 3 +- .../terremark/InternetServiceLiveTest.java | 3 +- .../terremark/ProvidersInPropertiesTest.java | 19 ++++++ .../terremark/TerremarkClientLiveTest.java | 26 ++++----- .../TerremarkECloudAsyncClientTest.java | 3 +- .../TerremarkECloudClientLiveTest.java | 3 +- .../TerremarkVCloudClientLiveTest.java | 3 +- ...TerremarkVCloudExpressAsyncClientTest.java | 3 +- ...indAddInternetServiceToXmlPayloadTest.java | 3 +- .../BindAddNodeServiceToXmlPayloadTest.java | 3 +- ...BindNodeConfigurationToXmlPayloadTest.java | 3 +- ...BindVAppConfigurationToXmlPayloadTest.java | 3 +- ...ateVAppTemplateParamsToXmlPayloadTest.java | 3 +- .../TerremarkVCloudComputeClientTest.java | 3 +- ...TerremarkVCloudComputeServiceLiveTest.java | 2 +- .../TerremarkVCloudTemplateOptionsTest.java | 19 ++++++ .../strategy/CleanupOrphanKeysTest.java | 3 +- ...yPairUnlessUserSpecifiedOtherwiseTest.java | 3 +- .../compute/strategy/DeleteKeyPairTest.java | 3 +- ...ltLoginCredentialsForVAppTemplateTest.java | 3 +- ...remarkVCloudErrorFromHttpResponseTest.java | 19 ++++++ .../AddInternetServiceOptionsTest.java | 3 +- .../terremark/options/AddNodeOptionsTest.java | 3 +- ...arkInstantiateVAppTemplateOptionsTest.java | 3 +- .../VAppTemplatesInOrgsLiveTest.java | 3 +- .../CustomizationParametersHandlerTest.java | 3 +- .../xml/InternetServiceHandlerTest.java | 3 +- .../xml/InternetServicesHandlerTest.java | 3 +- .../terremark/xml/IpAddressesHandlerTest.java | 3 +- .../vcloud/terremark/xml/KeyHandlerTest.java | 3 +- .../xml/KeyPairByNameHandlerTest.java | 1 + .../vcloud/terremark/xml/KeysHandlerTest.java | 3 +- .../vcloud/terremark/xml/NodeHandlerTest.java | 3 +- .../terremark/xml/NodesHandlerTest.java | 3 +- .../xml/PublicIpAddressHandlerTest.java | 3 +- .../xml/PublicIpAddressesHandlerTest.java | 3 +- .../xml/ResourceAllocationHandlerTest.java | 3 +- .../xml/TerremarkOrgHandlerTest.java | 19 ++++++ .../xml/TerremarkVDCHandlerTest.java | 3 +- .../vcloud/terremark/xml/VAppHandlerTest.java | 3 +- .../xml/VirtualSystemHandlerTest.java | 3 +- 2146 files changed, 6357 insertions(+), 4083 deletions(-) diff --git a/README.txt b/README.txt index 826cb8c4c9..a2e1cd7264 100644 --- a/README.txt +++ b/README.txt @@ -1,3 +1,22 @@ +==== + + Copyright (C) 2010 Cloud Conscious, LLC. + + ==================================================================== + Licensed 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. + ==================================================================== +==== + Overview: jclouds is an open source framework that helps you get started in the cloud diff --git a/archetypes/compute-service-archetype/pom.xml b/archetypes/compute-service-archetype/pom.xml index 250308b516..bbf39f2316 100644 --- a/archetypes/compute-service-archetype/pom.xml +++ b/archetypes/compute-service-archetype/pom.xml @@ -2,7 +2,7 @@ + ${appengine.applicationid} 1 diff --git a/aws/demos/googleappengine/src/main/appengine/logging.properties b/aws/demos/googleappengine/src/main/appengine/logging.properties index 479aec4070..b9059ceeef 100644 --- a/aws/demos/googleappengine/src/main/appengine/logging.properties +++ b/aws/demos/googleappengine/src/main/appengine/logging.properties @@ -1,6 +1,6 @@ # # -# Copyright (C) 2009 Cloud Conscious, LLC. +# Copyright (C) 2010 Cloud Conscious, LLC. # # ==================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,62 +16,6 @@ # limitations under the License. # ==================================================================== # -# -# -# Copyright (C) 2009 Cloud Conscious, LLC. -# -# ==================================================================== -# 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. -# ==================================================================== -# -# -# -# Copyright (C) 2009 Global Cloud Specialists, Inc. -# -# ==================================================================== -# 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. -# ==================================================================== -# -# A default java.util.logging configuration. -# (All App Engine logging is through java.util.logging by default). -# -# To use this configuration, copy it into your application's WEB-INF -# folder and add the following to your appengine-web.xml: -# -# -# -# -# # Set the default logging level for all loggers to WARNING .level = INFO diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllStatusController.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllStatusController.java index ddca57b87d..aa43ab0a1e 100755 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllStatusController.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllStatusController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine; import java.io.IOException; diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java index b17fcea5e4..6614c7dcc1 100755 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.config; import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_NODE_RUNNING; diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/domain/StatusResult.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/domain/StatusResult.java index d9fbec68cf..4bae858034 100755 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/domain/StatusResult.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/domain/StatusResult.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.domain; import java.io.Serializable; diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/BlobStoreContextToStatusResult.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/BlobStoreContextToStatusResult.java index 2a90a77bbe..042d325e6f 100755 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/BlobStoreContextToStatusResult.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/BlobStoreContextToStatusResult.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.functions; import java.util.Map; diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/ComputeServiceContextToStatusResult.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/ComputeServiceContextToStatusResult.java index 435d918a20..7d58e5954e 100644 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/ComputeServiceContextToStatusResult.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/ComputeServiceContextToStatusResult.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.functions; import java.util.Map; diff --git a/aws/demos/googleappengine/src/main/webapp/WEB-INF/jsp/status.jsp b/aws/demos/googleappengine/src/main/webapp/WEB-INF/jsp/status.jsp index 4d1c4c9e6f..78d30ff991 100755 --- a/aws/demos/googleappengine/src/main/webapp/WEB-INF/jsp/status.jsp +++ b/aws/demos/googleappengine/src/main/webapp/WEB-INF/jsp/status.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + <%@ page buffer="20kb"%> <%@ taglib uri="http://displaytag.sf.net" prefix="display"%> diff --git a/aws/demos/googleappengine/src/main/webapp/WEB-INF/web.xml b/aws/demos/googleappengine/src/main/webapp/WEB-INF/web.xml index b2e84f5e47..2ee71f16b2 100755 --- a/aws/demos/googleappengine/src/main/webapp/WEB-INF/web.xml +++ b/aws/demos/googleappengine/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + diff --git a/aws/demos/googleappengine/src/main/webapp/index.jsp b/aws/demos/googleappengine/src/main/webapp/index.jsp index 7d4b453580..a00db13f7c 100755 --- a/aws/demos/googleappengine/src/main/webapp/index.jsp +++ b/aws/demos/googleappengine/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + jclouds: multi-cloud framework diff --git a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java index b65bfbffff..8a7543fc20 100755 --- a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java +++ b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.functest; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java index bbc4342eb3..9122436db6 100755 --- a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java +++ b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.functest; import com.google.appengine.tools.KickStart; diff --git a/aws/demos/pom.xml b/aws/demos/pom.xml index 3ff2078cf9..b1d6a76dd1 100644 --- a/aws/demos/pom.xml +++ b/aws/demos/pom.xml @@ -2,7 +2,7 @@ + diff --git a/demos/gae-tweetstore-spring/README.txt b/demos/gae-tweetstore-spring/README.txt index 0531f59583..b333e3985d 100644 --- a/demos/gae-tweetstore-spring/README.txt +++ b/demos/gae-tweetstore-spring/README.txt @@ -1,6 +1,6 @@ ==== - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ limitations under the License. ==================================================================== ==== + This sample is a "port" of jclouds-demo-gae-tweetstore with the initial context setup and wiring carried out with Spring. It is intended to demonstrate how to integrate jclouds into your Spring application. diff --git a/demos/gae-tweetstore-spring/pom.xml b/demos/gae-tweetstore-spring/pom.xml index fcceff4b4a..9233720d10 100644 --- a/demos/gae-tweetstore-spring/pom.xml +++ b/demos/gae-tweetstore-spring/pom.xml @@ -2,7 +2,7 @@ + ${appengine.applicationid} 1 diff --git a/demos/gae-tweetstore-spring/src/main/appengine/logging.properties b/demos/gae-tweetstore-spring/src/main/appengine/logging.properties index 2ea5246602..d355b9e308 100644 --- a/demos/gae-tweetstore-spring/src/main/appengine/logging.properties +++ b/demos/gae-tweetstore-spring/src/main/appengine/logging.properties @@ -1,6 +1,6 @@ # # -# Copyright (C) 2009 Cloud Conscious, LLC. +# Copyright (C) 2010 Cloud Conscious, LLC. # # ==================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java index ad41ba048d..a915b53969 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.config; import org.jclouds.logging.Logger; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java index 9359cab6ad..ca1f9f9692 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.config; import static com.google.appengine.api.labs.taskqueue.TaskOptions.Builder.url; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java index d0f1eea3b8..13853875b3 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import java.io.IOException; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java index bd408987d6..414014e20a 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java index 79159c0052..b7d183c7a2 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.domain; import java.io.Serializable; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java index 4def339f4f..eac5f3be42 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.jclouds.util.Utils.toStringAndClose; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java index 04695e5d14..13a3350134 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import java.util.Collections; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java index 11fe6aae72..bae4e22fef 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.reference; /** diff --git a/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/dispatcher-servlet.xml index e80392f207..2cb1700537 100644 --- a/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/dispatcher-servlet.xml +++ b/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/dispatcher-servlet.xml @@ -2,7 +2,7 @@ + twitter diff --git a/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/web.xml b/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/web.xml index ca16b8e186..963e2f2ff9 100644 --- a/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/web.xml +++ b/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + diff --git a/demos/gae-tweetstore-spring/src/main/webapp/index.jsp b/demos/gae-tweetstore-spring/src/main/webapp/index.jsp index f1a620f27b..86a3d70d07 100644 --- a/demos/gae-tweetstore-spring/src/main/webapp/index.jsp +++ b/demos/gae-tweetstore-spring/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + jclouds: anyweight cloudware for java diff --git a/demos/gae-tweetstore-spring/src/main/webapp/tweets.jsp b/demos/gae-tweetstore-spring/src/main/webapp/tweets.jsp index 255bab82eb..1726e552dd 100644 --- a/demos/gae-tweetstore-spring/src/main/webapp/tweets.jsp +++ b/demos/gae-tweetstore-spring/src/main/webapp/tweets.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + <%@ page buffer="20kb"%> <%@ taglib uri="http://displaytag.sf.net" prefix="display"%> diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java index ff8a9f969b..74289ff97a 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java index 2b003d5884..75b665f84b 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static org.easymock.classextension.EasyMock.createMock; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java index 51906e2f66..347a02bc5b 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java index 6217a38eb2..faf131cc17 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java index 585872cbb0..231fac183c 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.integration; import com.google.appengine.tools.KickStart; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java index 2ee32afec7..1191c13242 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.integration; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/demos/gae-tweetstore/README.txt b/demos/gae-tweetstore/README.txt index a50d18d4b0..d4e2ae8cc1 100755 --- a/demos/gae-tweetstore/README.txt +++ b/demos/gae-tweetstore/README.txt @@ -1,6 +1,6 @@ ==== - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ limitations under the License. ==================================================================== ==== + This sample uses the Google App Engine for Java SDK located at http://code.google.com/p/googleappengine/downloads/list diff --git a/demos/gae-tweetstore/pom.xml b/demos/gae-tweetstore/pom.xml index edea967a60..0cde8b8c4b 100644 --- a/demos/gae-tweetstore/pom.xml +++ b/demos/gae-tweetstore/pom.xml @@ -2,7 +2,7 @@ + ${appengine.applicationid} 1 diff --git a/demos/gae-tweetstore/src/main/appengine/logging.properties b/demos/gae-tweetstore/src/main/appengine/logging.properties index a86b9d708b..29fad00bb8 100644 --- a/demos/gae-tweetstore/src/main/appengine/logging.properties +++ b/demos/gae-tweetstore/src/main/appengine/logging.properties @@ -1,6 +1,6 @@ # # -# Copyright (C) 2009 Cloud Conscious, LLC. +# Copyright (C) 2010 Cloud Conscious, LLC. # # ==================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,37 +16,6 @@ # limitations under the License. # ==================================================================== # -# Copyright (C) 2009 Global Cloud Specialists, Inc. -# -# ==================================================================== -# 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. -# ==================================================================== -# -# A default java.util.logging configuration. -# (All App Engine logging is through java.util.logging by default). -# -# To use this configuration, copy it into your application's WEB-INF -# folder and add the following to your appengine-web.xml: -# -# -# -# -# # Set the default logging level for all loggers to WARNING .level = INFO diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java index d41252efce..de6913b92c 100755 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.config; import static com.google.appengine.api.labs.taskqueue.TaskOptions.Builder.url; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java index 8b12d11b34..fe734e9fed 100755 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import java.io.IOException; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java index bd408987d6..414014e20a 100644 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java index 79159c0052..b7d183c7a2 100755 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.domain; import java.io.Serializable; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java index 4def339f4f..eac5f3be42 100644 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.jclouds.util.Utils.toStringAndClose; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java index 04695e5d14..13a3350134 100755 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import java.util.Collections; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java index 11fe6aae72..bae4e22fef 100644 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.reference; /** diff --git a/demos/gae-tweetstore/src/main/webapp/WEB-INF/queue.xml b/demos/gae-tweetstore/src/main/webapp/WEB-INF/queue.xml index 6225291c28..5ff5027098 100644 --- a/demos/gae-tweetstore/src/main/webapp/WEB-INF/queue.xml +++ b/demos/gae-tweetstore/src/main/webapp/WEB-INF/queue.xml @@ -2,7 +2,7 @@ + twitter diff --git a/demos/gae-tweetstore/src/main/webapp/WEB-INF/web.xml b/demos/gae-tweetstore/src/main/webapp/WEB-INF/web.xml index b8e8fa4667..32aa161d85 100755 --- a/demos/gae-tweetstore/src/main/webapp/WEB-INF/web.xml +++ b/demos/gae-tweetstore/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + diff --git a/demos/gae-tweetstore/src/main/webapp/index.jsp b/demos/gae-tweetstore/src/main/webapp/index.jsp index f1a620f27b..86a3d70d07 100755 --- a/demos/gae-tweetstore/src/main/webapp/index.jsp +++ b/demos/gae-tweetstore/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + jclouds: anyweight cloudware for java diff --git a/demos/gae-tweetstore/src/main/webapp/tweets.jsp b/demos/gae-tweetstore/src/main/webapp/tweets.jsp index 255bab82eb..1726e552dd 100755 --- a/demos/gae-tweetstore/src/main/webapp/tweets.jsp +++ b/demos/gae-tweetstore/src/main/webapp/tweets.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + <%@ page buffer="20kb"%> <%@ taglib uri="http://displaytag.sf.net" prefix="display"%> diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java index 893e19c8e0..019550afd8 100644 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java index 2b003d5884..75b665f84b 100644 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static org.easymock.classextension.EasyMock.createMock; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java index 6079c8a31a..843afd5fa2 100644 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java index 6217a38eb2..faf131cc17 100644 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java index 585872cbb0..231fac183c 100755 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.integration; import com.google.appengine.tools.KickStart; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java index a05ac32e9b..ba8099aa05 100755 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.integration; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/demos/pom.xml b/demos/pom.xml index e3e91a070b..dc078a0498 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -2,7 +2,7 @@ +--> + 4.0.0 org.jclouds @@ -96,21 +97,22 @@ pageTracker._trackPageview(); com.mycila.maven-license-plugin maven-license-plugin - 1.5.0 + 1.8.0 + true ${sourceEncoding} true
project/src/etc/header.txt
+ +     SEMICOLON_STYLE + - - **/src/main/java/com/amazon/** - **/S3Driver.java thirdparty/** **/src/**/resources/** **/LICENSE.txt - ${project.inceptionYear} + 2010 info@cloudconscious.com Cloud Conscious, LLC diff --git a/project/pom.xml b/project/pom.xml index 8297a4860c..550e131015 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -2,7 +2,7 @@ + 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. + ==================================================================== + +--> jclouds-project diff --git a/tools/antcontrib/pom.xml b/tools/antcontrib/pom.xml index 3b528e1820..2e8eadd64c 100644 --- a/tools/antcontrib/pom.xml +++ b/tools/antcontrib/pom.xml @@ -2,7 +2,7 @@ + diff --git a/tools/antcontrib/samples/cargooverssh/runscript.sh b/tools/antcontrib/samples/cargooverssh/runscript.sh index 8668ff9938..8dbde3ddb2 100644 --- a/tools/antcontrib/samples/cargooverssh/runscript.sh +++ b/tools/antcontrib/samples/cargooverssh/runscript.sh @@ -1,3 +1,22 @@ +# +# +# Copyright (C) 2010 Cloud Conscious, LLC. +# +# ==================================================================== +# Licensed 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. +# ==================================================================== +# + echo nameserver 208.67.222.222 >> /etc/resolv.conf apt-get update -qq apt-get upgrade -y -qq diff --git a/tools/antcontrib/samples/compute/build.xml b/tools/antcontrib/samples/compute/build.xml index 2f22b9b425..aa75b99227 100644 --- a/tools/antcontrib/samples/compute/build.xml +++ b/tools/antcontrib/samples/compute/build.xml @@ -1,7 +1,7 @@ + diff --git a/tools/antcontrib/samples/javaoverssh/README.txt b/tools/antcontrib/samples/javaoverssh/README.txt index 34cf2739c9..ce3aa073a6 100755 --- a/tools/antcontrib/samples/javaoverssh/README.txt +++ b/tools/antcontrib/samples/javaoverssh/README.txt @@ -1,6 +1,6 @@ ==== - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ limitations under the License. ==================================================================== ==== + this is a simple ant script that executes a java command on a remote machine via ssh 1. find or download a copy of jclouds-antcontrib-1.0-SNAPSHOT-jar-with-dependencies.jar - ex. ~/.m2/repository/org/jclouds/jclouds-antcontrib/1.0-SNAPSHOT/jclouds-antcontrib-1.0-SNAPSHOT-jar-with-dependencies.jar diff --git a/tools/antcontrib/samples/javaoverssh/build.xml b/tools/antcontrib/samples/javaoverssh/build.xml index 3cb9fa25ec..34f03eb2a2 100644 --- a/tools/antcontrib/samples/javaoverssh/build.xml +++ b/tools/antcontrib/samples/javaoverssh/build.xml @@ -2,7 +2,7 @@ + simple example build file diff --git a/tools/antcontrib/samples/javaoverssh/src/TestClass.java b/tools/antcontrib/samples/javaoverssh/src/TestClass.java index 282db72c11..30289049fb 100644 --- a/tools/antcontrib/samples/javaoverssh/src/TestClass.java +++ b/tools/antcontrib/samples/javaoverssh/src/TestClass.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/AntLogger.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/AntLogger.java index 025931be94..78eae3cdd8 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/AntLogger.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/AntLogger.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.logging; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/config/AntLoggingModule.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/config/AntLoggingModule.java index f2da6902d1..d0f4bd949d 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/config/AntLoggingModule.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/config/AntLoggingModule.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.logging.config; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java index 0a52571a65..097a7b5848 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.compute; import static org.jclouds.compute.util.ComputeServiceUtils.isKeyAuth; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java index d064d15fda..47a33d1e55 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java @@ -1,26 +1,22 @@ /** * - * Copyright (C) 2009 Global Cloud Specialists, Inc. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== - * 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 + * Licensed 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 + * 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. + * 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. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.compute; import static org.jclouds.rest.RestContextFactory.getPropertiesFromResource; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/NodeElement.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/NodeElement.java index 63bca76a37..addddbacb5 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/NodeElement.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/NodeElement.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.compute; import java.io.File; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java index e201c384c3..2a1e837e04 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.sshjava; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/util/SSHExecute.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/util/SSHExecute.java index e71aa4895c..3b3d803c4f 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/util/SSHExecute.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/util/SSHExecute.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.util; import java.io.IOException; diff --git a/tools/antcontrib/src/test/java/org/jclouds/tools/ant/TestClass.java b/tools/antcontrib/src/test/java/org/jclouds/tools/ant/TestClass.java index e56a02e77d..d9931da6be 100644 --- a/tools/antcontrib/src/test/java/org/jclouds/tools/ant/TestClass.java +++ b/tools/antcontrib/src/test/java/org/jclouds/tools/ant/TestClass.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java b/tools/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java index 66039da3ae..937eb2499d 100644 --- a/tools/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java +++ b/tools/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.sshjava; import static org.testng.Assert.assertEquals; diff --git a/tools/getpath/README.txt b/tools/getpath/README.txt index 6ddf904356..a32998a303 100755 --- a/tools/getpath/README.txt +++ b/tools/getpath/README.txt @@ -1,6 +1,6 @@ ==== - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ limitations under the License. ==================================================================== ==== + # # this is a simple command line client that obtains the contents of a container # 1. execute 'mvn install' to build the sample diff --git a/tools/getpath/pom.xml b/tools/getpath/pom.xml index 9a863b7241..616fea3661 100644 --- a/tools/getpath/pom.xml +++ b/tools/getpath/pom.xml @@ -2,7 +2,7 @@ + +