You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/05/14 19:46:21 UTC

[7/7] git commit: JCLOUDS-37. Fix RAT violations in incubator-jclouds, 1.5.x branch

JCLOUDS-37. Fix RAT violations in incubator-jclouds, 1.5.x branch


Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/70754d86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/70754d86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/70754d86

Branch: refs/heads/1.5.x
Commit: 70754d86a9fbf143ddb81ff3c88dc11bd96a654a
Parents: a0e6cc7
Author: Andrew Bayer <an...@gmail.com>
Authored: Mon May 13 16:33:11 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Tue May 14 08:30:16 2013 -0700

----------------------------------------------------------------------
 .../AddSessionKeyAndJSessionIdToRequest.java       |   18 +++
 .../GetFirewallRulesByVirtualMachine.java          |   18 +++
 .../GetIPForwardingRulesByVirtualMachine.java      |   18 +++
 .../ParseLoginResponseFromHttpResponse.java        |   18 +++
 .../cloudwatch/features/MetricApiExpectTest.java   |    6 +-
 .../org/jclouds/ec2/xml/IpPermissionHandler.java   |   18 +++
 .../BindResourceIdsToIndexedFormParamsTest.java    |   18 +++
 .../jclouds/ec2/features/SubnetApiExpectTest.java  |    6 +-
 .../org/jclouds/ec2/features/TagApiExpectTest.java |    6 +-
 .../jclouds/ec2/features/WindowsApiExpectTest.java |    6 +-
 .../jclouds/ec2/internal/BaseEC2ApiLiveTest.java   |   18 +++
 .../ec2/internal/BaseEC2ClientLiveTest.java        |   18 +++
 .../openstack/cinder/v1/features/SnapshotApi.java  |   18 +++
 .../openstack/cinder/v1/features/VolumeApi.java    |   18 +++
 .../cinder/v1/features/VolumeTypeApi.java          |   18 +++
 .../openstack/keystone/v2_0/domain/Tenant.java     |    2 +-
 .../v2_0/functions/RegionToAdminEndpointURI.java   |   18 +++
 .../v2_0/suppliers/RegionIdToAdminURISupplier.java |   18 +++
 .../org/jclouds/openstack/v2_0/ServiceType.java    |    2 +-
 .../keystone/v2_0/KeystoneApiExpectTest.java       |    4 +-
 .../keystone/v2_0/KeystoneApiLiveTest.java         |    4 +-
 .../v2_0/features/ServiceApiExpectTest.java        |    4 +-
 .../keystone/v2_0/features/ServiceApiLiveTest.java |    4 +-
 .../v2_0/features/TenantApiExpectTest.java         |    4 +-
 .../keystone/v2_0/features/TenantApiLiveTest.java  |    4 +-
 .../keystone/v2_0/features/TokenApiExpectTest.java |    4 +-
 .../keystone/v2_0/features/TokenApiLiveTest.java   |    4 +-
 .../keystone/v2_0/features/UserApiExpectTest.java  |    4 +-
 .../keystone/v2_0/features/UserApiLiveTest.java    |    4 +-
 .../internal/BaseKeystoneRestApiExpectTest.java    |    4 +-
 .../v2_0/parse/ParseDevstackApiMetadataTest.java   |    2 +-
 .../v2_0/parse/ParseRackspaceApiMetadataTest.java  |    2 +-
 .../v2_0/functions/ExtensionToNameSpaceTest.java   |   18 +++
 ...spaceEqualsAnyNamespaceInExtensionsSetTest.java |   18 +++
 .../v2_0/predicates/LinkPredicatesTest.java        |   18 +++
 .../internal/BaseNovaEC2RestClientExpectTest.java  |   18 +++
 .../services/NovaEC2InstanceClientExpectTest.java  |   18 +++
 .../nova/v2_0/extensions/ExtensionNamespaces.java  |    2 +-
 .../v2_0/functions/FieldValueResponseParsers.java  |   18 +++
 .../v2_0/functions/internal/ParseDiagnostics.java  |   27 +++--
 .../openstack/nova/v2_0/NovaApiMetadataTest.java   |   18 +++
 .../v2_0/compute/NovaComputeServiceLiveTest.java   |   18 +++
 .../v2_0/parse/ParseServerDetailsEssexTest.java    |    2 +-
 .../nova/v2_0/parse/ParseServerDiagnostics.java    |   18 +++
 .../v2_0/CloudIdentityApiLiveTest.java             |    4 +-
 .../features/CloudIdentityServiceApiLiveTest.java  |    4 +-
 .../features/CloudIdentityTenantApiLiveTest.java   |    4 +-
 .../features/CloudIdentityTokenApiLiveTest.java    |    4 +-
 .../features/CloudIdentityUserApiLiveTest.java     |    4 +-
 .../org/jclouds/route53/Route53ApiExpectTest.java  |    6 +-
 .../route53/features/HostedZoneApiExpectTest.java  |    6 +-
 .../features/ResourceRecordSetApiExpectTest.java   |    6 +-
 .../features/ResourceRecordSetApiLiveTest.java     |    6 +-
 .../sqs/options/CreateQueueOptionsTest.java        |   18 +++
 .../sqs/options/ReceiveMessageOptionsTest.java     |   18 +++
 .../java/org/jclouds/sts/STSApiExpectTest.java     |    6 +-
 ...indMapToHeadersWithContainerMetadataPrefix.java |   18 +++
 .../swift/blobstore/strategy/MultipartUpload.java  |   18 +++
 .../internal/AsyncMultipartUploadStrategy.java     |   18 +++
 .../strategy/internal/MultipartUploadStrategy.java |   18 +++
 .../internal/ParallelMultipartUploadStrategy.java  |   18 +++
 .../SequentialMultipartUploadStrategy.java         |   18 +++
 .../config/SwiftKeystoneRestClientModule.java      |   18 +++
 .../internal/BaseSwiftKeystoneExpectTest.java      |   18 +++
 .../strategy/VCloudComputeServiceAdapterTest.java  |   18 +++
 .../META-INF/maven/archetype-metadata.xml          |   20 +++
 .../META-INF/maven/archetype-metadata.xml          |   20 +++
 .../src/test/java/features/KeyApiExpectTest.java   |    6 +-
 .../jar-with-dependencies-descriptor.xml           |   20 +++
 ...ith-dependencies-no-core-no-apis-descriptor.xml |   20 +++
 .../resources/assemblies/package-descriptor.xml    |   20 +++
 .../provided-dependencies-descriptor.xml           |   20 +++
 .../main/resources/assemblies/src-descriptor.xml   |   20 +++
 .../jclouds/blobstore/options/ListAllOptions.java  |   18 +++
 .../openstack/domain/AuthenticationResponse.java   |    2 +-
 .../java/org/jclouds/openstack/domain/Link.java    |    2 +-
 .../org/jclouds/openstack/domain/Resource.java     |    2 +-
 .../openstack/keystone/v1_1/domain/Auth.java       |    2 +-
 .../openstack/keystone/v1_1/domain/Endpoint.java   |    2 +-
 .../openstack/keystone/v1_1/domain/Token.java      |    2 +-
 .../v1_1/functions/PublicURLOrInternalIfNull.java  |   11 +--
 .../jclouds/openstack/services/ServiceType.java    |    2 +-
 .../internal/BaseKeystoneRestClientExpectTest.java |    4 +-
 .../openstack/predicates/LinkPredicatesTest.java   |   18 +++
 .../trmk/vcloud_0_8/domain/VAppExtendedInfo.java   |    2 +-
 .../internal/TerremarkVCloudApiMetadata.java       |   18 +++
 .../main/resources/ConfigureInternetService.xml    |   20 +++
 .../src/main/resources/CreateInternetService.xml   |   20 +++
 common/trmk/src/main/resources/CreateKey.xml       |   20 +++
 .../trmk/src/main/resources/CreateNodeService.xml  |   20 +++
 .../CreateInternetService-options-test.xml         |   20 +++
 .../test/resources/CreateInternetService-test.xml  |   20 +++
 .../test/resources/CreateInternetService-test2.xml |   20 +++
 .../resources/CreateNodeService-options-test.xml   |   20 +++
 .../src/test/resources/CreateNodeService-test.xml  |   20 +++
 .../src/test/resources/CreateNodeService-test2.xml |   20 +++
 .../compute/util/ConcurrentOpenSocketFinder.java   |   18 +++
 .../org/jclouds/compute/util/OpenSocketFinder.java |   18 +++
 .../BaseComputeServiceApiMetadataTest.java         |   18 +++
 ...ndAppendUniqueStringToThoseWhichRepeatTest.java |    2 +-
 .../util/ConcurrentOpenSocketFinderTest.java       |   18 +++
 compute/src/test/resources/initscript_with_java.sh |   98 ++++++++++++++-
 .../src/test/resources/initscript_with_jetty.sh    |   98 ++++++++++++++-
 compute/src/test/resources/runscript.sh            |   98 ++++++++++++++-
 .../src/test/resources/runscript_adminUpdate.sh    |   48 +++++++
 .../jclouds/collect/AdvanceUntilEmptyIterable.java |    2 +-
 .../org/jclouds/collect/IterableWithMarkers.java   |    2 +-
 .../java/org/jclouds/collect/PagedIterables.java   |    2 +-
 .../config/ScheduledExecutorServiceModule.java     |   18 +++
 .../java/org/jclouds/io/ContentMetadataCodec.java  |   18 +++
 .../collect/AdvanceUntilEmptyIterableTest.java     |    2 +-
 .../jclouds/collect/IterableWithMarkersTest.java   |   18 +++
 .../org/jclouds/collect/PagedIterablesTest.java    |    2 +-
 .../collect/internal/Arg0ToPagedIterableTest.java  |    2 +-
 .../functions/HeaderToRetryAfterExceptionTest.java |   18 +++
 .../java/org/jclouds/gae/GaeSocketOpenTest.java    |   18 +++
 labs/abiquo/pom.xml                                |   20 +++
 .../functions/DeploymentToNodeMetadata.java        |   18 +++
 .../compute/functions/OSImageToImage.java          |   18 +++
 .../compute/functions/RoleSizeToHardware.java      |   18 +++
 .../azure/management/domain/Deployment.java        |   18 +++
 .../azure/management/domain/DeploymentParams.java  |   18 +++
 .../azure/management/domain/DeploymentSlot.java    |   18 +++
 .../azure/management/domain/DeploymentStatus.java  |   18 +++
 .../azure/management/domain/InputEndpoint.java     |   18 +++
 .../azure/management/domain/InstanceStatus.java    |   18 +++
 .../jclouds/azure/management/domain/RoleSize.java  |   18 +++
 .../domain/hostedservice/CreateDeployment.java     |   18 +++
 .../domain/hostedservice/ExtendedProperty.java     |   18 +++
 .../azure/management/domain/role/AbstractRole.java |   18 +++
 .../jclouds/azure/management/domain/role/DNS.java  |   18 +++
 .../azure/management/domain/role/DNSServer.java    |   18 +++
 .../domain/role/DataVirtualHardDisk.java           |   18 +++
 .../azure/management/domain/role/Deployment.java   |   18 +++
 .../azure/management/domain/role/HostCaching.java  |   18 +++
 .../management/domain/role/OSVirtualHardDisk.java  |   18 +++
 .../management/domain/role/PersistentVMRole.java   |   18 +++
 .../azure/management/domain/role/Protocol.java     |   18 +++
 .../jclouds/azure/management/domain/role/Role.java |   18 +++
 .../azure/management/domain/role/RoleSize.java     |   18 +++
 .../management/domain/role/VirtualHardDisk.java    |   18 +++
 .../domain/role/conf/CertificateSetting.java       |   18 +++
 .../domain/role/conf/ConfigurationSet.java         |   18 +++
 .../domain/role/conf/ConfigurationSetAdapter.java  |   18 +++
 .../management/domain/role/conf/Credentials.java   |   18 +++
 .../management/domain/role/conf/DomainJoin.java    |   18 +++
 .../management/domain/role/conf/InputEndpoint.java |   18 +++
 .../azure/management/domain/role/conf/KeyPair.java |   18 +++
 .../role/conf/LinuxProvisioningConfiguration.java  |   18 +++
 .../domain/role/conf/LoadBalancerProbe.java        |   18 +++
 .../domain/role/conf/NetworkConfiguration.java     |   18 +++
 .../management/domain/role/conf/PublicKey.java     |   18 +++
 .../azure/management/domain/role/conf/SSH.java     |   18 +++
 .../azure/management/domain/role/conf/SSHKey.java  |   18 +++
 .../conf/WindowsProvisioningConfiguration.java     |   18 +++
 ...HostedServiceWithDetailedPropertiesHandler.java |   18 +++
 .../AzureManagementProviderMetadataTest.java       |    2 +-
 .../management/features/DiskApiExpectTest.java     |    6 +-
 .../features/HostedServiceApiExpectTest.java       |    6 +-
 .../management/features/LocationApiExpectTest.java |    6 +-
 .../management/features/OSImageApiExpectTest.java  |    6 +-
 .../features/OperationApiExpectTest.java           |    6 +-
 .../management/features/RoleApiExpectTest.java     |    6 +-
 .../cdmi/v1/options/CreateCDMIObjectOptions.java   |   18 +++
 .../cdmi/v1/options/CreateContainerOptions.java    |   18 +++
 .../v1/options/CreateDataObjectNonCDMIOptions.java |   18 +++
 .../cdmi/v1/options/CreateDataObjectOptions.java   |   18 +++
 .../snia/cdmi/v1/options/GetCDMIObjectOptions.java |   18 +++
 .../snia/cdmi/v1/options/GetContainerOptions.java  |   18 +++
 .../cdmi/v1/queryparams/CDMIObjectQueryParams.java |   18 +++
 .../cdmi/v1/queryparams/ContainerQueryParams.java  |   18 +++
 .../cdmi/v1/queryparams/DataObjectQueryParams.java |   18 +++
 .../snia/cdmi/v1/features/DomainApiExpectTest.java |    6 +-
 .../org/jclouds/dmtf/cim/CimUnsignedShort.java     |   18 +++
 .../dynect/v3/domain/CreatePrimaryZone.java        |    2 +-
 .../java/org/jclouds/dynect/v3/domain/Record.java  |    2 +-
 .../org/jclouds/dynect/v3/domain/RecordId.java     |    2 +-
 .../org/jclouds/dynect/v3/domain/SOARecord.java    |    2 +-
 .../java/org/jclouds/dynect/v3/domain/Session.java |    2 +-
 .../dynect/v3/domain/SessionCredentials.java       |   18 +++
 .../java/org/jclouds/dynect/v3/domain/Zone.java    |    2 +-
 .../jclouds/dynect/v3/domain/rdata/AAAAData.java   |    2 +-
 .../org/jclouds/dynect/v3/domain/rdata/AData.java  |    2 +-
 .../jclouds/dynect/v3/domain/rdata/CNAMEData.java  |    2 +-
 .../org/jclouds/dynect/v3/domain/rdata/MXData.java |    2 +-
 .../org/jclouds/dynect/v3/domain/rdata/NSData.java |    2 +-
 .../jclouds/dynect/v3/domain/rdata/PTRData.java    |    2 +-
 .../jclouds/dynect/v3/domain/rdata/SOAData.java    |    2 +-
 .../jclouds/dynect/v3/domain/rdata/SRVData.java    |    2 +-
 .../jclouds/dynect/v3/domain/rdata/TXTData.java    |    2 +-
 .../org/jclouds/dynect/v3/features/RecordApi.java  |    2 +-
 .../jclouds/dynect/v3/features/RecordAsyncApi.java |    2 +-
 .../org/jclouds/dynect/v3/features/ZoneApi.java    |    2 +-
 .../jclouds/dynect/v3/features/ZoneAsyncApi.java   |    2 +-
 .../dynect/v3/functions/ExtractZoneNames.java      |    2 +-
 .../jclouds/dynect/v3/functions/ToRecordIds.java   |    2 +-
 .../dynect/v3/predicates/RecordPredicates.java     |    2 +-
 .../dynect/v3/features/RecordApiExpectTest.java    |    2 +-
 .../dynect/v3/features/RecordApiLiveTest.java      |    4 +-
 .../dynect/v3/features/SessionApiExpectTest.java   |    6 +-
 .../dynect/v3/features/ZoneApiExpectTest.java      |    2 +-
 .../dynect/v3/features/ZoneApiLiveTest.java        |    2 +-
 .../dynect/v3/parse/GetAAAARecordResponseTest.java |    2 +-
 .../dynect/v3/parse/GetARecordResponseTest.java    |    2 +-
 .../v3/parse/GetCNAMERecordResponseTest.java       |    2 +-
 .../dynect/v3/parse/GetMXRecordResponseTest.java   |    2 +-
 .../dynect/v3/parse/GetPTRRecordResponseTest.java  |    2 +-
 .../dynect/v3/parse/GetTXTRecordResponseTest.java  |    2 +-
 .../dynect/v3/predicates/RecordPredicatesTest.java |   18 +++
 .../domain/regionscoped/LoadBalancerInRegion.java  |   18 +++
 .../features/AvailabilityZoneApiExpectTest.java    |    6 +-
 .../elb/features/InstanceApiExpectTest.java        |    6 +-
 .../elb/features/LoadBalancerApiExpectTest.java    |    6 +-
 .../jclouds/elb/features/PolicyApiExpectTest.java  |    6 +-
 .../fujitsu/fgcp/domain/VServerWithVNICs.java      |   18 +++
 .../org/jclouds/fujitsu/fgcp/domain/jaxb.index     |   18 +++-
 .../jclouds/fujitsu/fgcp/xml/internal/jaxb.index   |   16 +++
 .../compute/FGCPBaseTemplateBuilderLiveTest.java   |   18 +++
 .../config/FGCPBaseComputeServiceLiveTest.java     |   18 +++
 .../functions/DiskImageToOperatingSystemTest.java  |   18 +++
 .../jclouds/iam/features/RolePolicyAsyncApi.java   |    1 +
 .../iam/features/InstanceProfileApiExpectTest.java |    6 +-
 .../jclouds/iam/features/RoleApiExpectTest.java    |    6 +-
 .../iam/features/RolePolicyApiExpectTest.java      |    6 +-
 .../jclouds/iam/features/UserApiExpectTest.java    |    6 +-
 .../org/jclouds/jenkins/v1/domain/Computer.java    |   18 +++
 .../jclouds/jenkins/v1/domain/ComputerView.java    |   18 +++
 .../java/org/jclouds/jenkins/v1/domain/Node.java   |   18 +++
 .../joyent/cloudapi/v6_5/features/DatasetApi.java  |   18 +++
 .../cloudapi/v6_5/features/DatasetAsyncApi.java    |   18 +++
 .../joyent/cloudapi/v6_5/features/KeyApi.java      |   18 +++
 .../joyent/cloudapi/v6_5/features/KeyAsyncApi.java |   18 +++
 .../joyent/cloudapi/v6_5/features/PackageApi.java  |   18 +++
 .../cloudapi/v6_5/features/PackageAsyncApi.java    |   18 +++
 .../cloudapi/v6_5/JoyentCloudApiExpectTest.java    |    6 +-
 .../v6_5/features/DatacenterApiExpectTest.java     |    6 +-
 .../v6_5/features/DatasetApiExpectTest.java        |    6 +-
 .../cloudapi/v6_5/features/KeyApiExpectTest.java   |    6 +-
 .../v6_5/features/MachineApiExpectTest.java        |    6 +-
 .../v6_5/features/PackageApiExpectTest.java        |    6 +-
 .../JoyentCloudProviderMetadataTest.java           |    2 +-
 .../openstack/cinder/v1/domain/VolumeTest.java     |   18 +++
 .../glance/v1_0/features/ImageApiExpectTest.java   |    6 +-
 .../v1_0/features/NetworkApiExpectTest.java        |    4 +-
 .../quantum/v1_0/features/NetworkApiLiveTest.java  |    4 +-
 .../quantum/v1_0/features/PortApiExpectTest.java   |    4 +-
 .../quantum/v1_0/features/PortApiLiveTest.java     |    4 +-
 .../jclouds/openstack/swift/v1/domain/Account.java |   18 +++
 .../openstack/swift/v1/domain/Container.java       |   18 +++
 .../swift/v1/features/AccountApiExpectTest.java    |    6 +-
 .../config/OpSourceServersRestClientModule.java    |    1 +
 .../rds/features/InstanceApiExpectTest.java        |    6 +-
 .../rds/features/SecurityGroupApiExpectTest.java   |    6 +-
 .../rds/features/SubnetGroupApiExpectTest.java     |    6 +-
 .../org/jclouds/smartos/SmartOSApiMetadata.java    |   18 +++
 .../org/jclouds/smartos/SmartOSHostController.java |   18 +++
 .../jclouds/smartos/compute/domain/DataSet.java    |   18 +++
 .../org/jclouds/smartos/compute/domain/VM.java     |   18 +++
 .../org/jclouds/smartos/compute/domain/VmNIC.java  |   18 +++
 .../smartos/compute/domain/VmSpecification.java    |   18 +++
 .../smartos/compute/domain/DataSetTest.java        |   18 +++
 .../org/jclouds/smartos/compute/domain/VMTest.java |   18 +++
 .../jclouds/ultradns/ws/UltraDNSWSExceptions.java  |    5 +-
 .../ultradns/ws/UltraDNSWSApiExpectTest.java       |    6 +-
 .../vcloud/director/v1_5/annotations/Login.java    |   18 +++
 .../vcloud/director/v1_5/annotations/Session.java  |   18 +++
 .../jclouds/vcloud/director/v1_5/domain/Role.java  |   18 +++
 .../jclouds/vcloud/director/v1_5/domain/Task.java  |    2 +-
 .../director/v1_5/domain/network/Network.java      |    4 +-
 .../v1_5/domain/network/SyslogServerSettings.java  |    4 +-
 .../director/v1_5/domain/org/OrgNetwork.java       |    4 +-
 .../AddVCloudAuthorizationAndCookieToRequest.java  |   18 +++
 .../director/v1_5/AbstractVAppApiLiveTest.java     |    4 +-
 .../v1_5/binders/BindMapAsMetadataTest.java        |    4 +-
 .../binders/BindStringAsMetadataValueTest.java     |    4 +-
 .../v1_5/features/KeyPairsApiLiveTest.java         |    4 +-
 .../director/v1_5/features/MediaApiExpectTest.java |    4 +-
 .../director/v1_5/features/MediaApiLiveTest.java   |    4 +-
 .../director/v1_5/features/UploadApiLiveTest.java  |    4 +-
 .../director/v1_5/features/VAppApiExpectTest.java  |    4 +-
 .../director/v1_5/features/VAppApiLiveTest.java    |    4 +-
 .../director/v1_5/features/VdcApiExpectTest.java   |    4 +-
 .../director/v1_5/features/VdcApiLiveTest.java     |    4 +-
 .../director/v1_5/features/VmApiExpectTest.java    |    4 +-
 .../director/v1_5/features/VmApiLiveTest.java      |    4 +-
 .../v1_5/features/admin/AdminVdcApiLiveTest.java   |    4 +-
 .../systemadmin/SystemAdminVAppApiExpectTest.java  |    4 +-
 .../systemadmin/SystemAdminVAppApiLiveTest.java    |    4 +-
 .../systemadmin/SystemAdminVmApiExpectTest.java    |    4 +-
 .../systemadmin/SystemAdminVmApiLiveTest.java      |    4 +-
 .../director/v1_5/login/SessionApiExpectTest.java  |    4 +-
 .../director/v1_5/login/SessionApiLiveTest.java    |    4 +-
 .../src/main/resources/default-images.yaml         |   18 +++-
 .../resources/functions/cleanupUdevIfNeeded.sh     |   16 +++
 .../functions/exportIpAddressFromVmNamed.sh        |   16 +++
 .../src/main/resources/functions/getIpAddress.cmd  |   16 +++
 .../src/main/resources/functions/getIpAddress.sh   |   16 +++
 .../functions/installModuleAssistantIfNeeded.sh    |   16 +++
 .../functions/BridgedIfStringToBridgedIfTest.java  |   18 +++
 .../test_export_ip_address_from_vm_named.sh        |   32 +++++
 pom.xml                                            |   12 ++-
 .../org/jclouds/aws/s3/xml/ErrorEntryHandler.java  |   18 +++
 .../compute/functions/OSTemplateToImage.java       |    2 +-
 .../jclouds/glesys/domain/AllowedArguments.java    |   18 +++
 .../org/jclouds/glesys/domain/GleSYSBoolean.java   |   18 +++
 .../jclouds/glesys/reference/GleSYSConstants.java  |   18 +++
 .../services/BaseGoGridRestClientExpectTest.java   |   18 +++
 .../services/GridServerClientExpectTest.java       |   18 +++
 .../compute/HPCloudComputeServiceAdapter.java      |   18 +++
 .../compute/HPCloudComputeProviderTest.java        |    4 +-
 .../HPCloudComputeComputeServiceLiveTest.java      |    2 +-
 .../HPCloudComputeTemplateBuilderLiveTest.java     |    2 +-
 .../hpcloud/services/HPExtensionServiceType.java   |    2 +-
 .../compute/NinefoldComputeProviderMetadata.java   |   18 +++
 .../uk/CloudBlockStorageUKProviderTest.java        |    2 +-
 .../us/CloudBlockStorageUSProviderTest.java        |    2 +-
 .../CloudServersUKProviderMetadataExpectTest.java  |    2 +-
 .../uk/CloudServersUKProviderTest.java             |    4 +-
 .../CloudServersUKComputeServiceLiveTest.java      |    2 +-
 .../CloudServersUKTemplateBuilderLiveTest.java     |    2 +-
 .../us/CloudServersUSProviderTest.java             |    4 +-
 .../CloudServersUSComputeServiceLiveTest.java      |    2 +-
 .../CloudServersUSTemplateBuilderLiveTest.java     |    2 +-
 .../slicehost/SlicehostProviderMetadata.java       |   18 +++
 .../storage/SynapticStorageProviderMetadata.java   |   18 +++
 .../trmk/ecloud/TerremarkECloudApiMetadata.java    |   18 +++
 .../CreateInternetService-options-test.xml         |   20 +++
 .../trystack/nova/TryStackNovaServiceAdapter.java  |   18 +++
 .../trystack/nova/TryStackNovaProviderTest.java    |    4 +-
 .../TryStackNovaComputeServiceLiveTest.java        |    2 +-
 .../TryStackNovaTemplateBuilderLiveTest.java       |    2 +-
 .../statements/login/AdminAccessBuilderSpec.java   |   18 +++
 .../src/main/resources/functions/abort.cmd         |   16 +++
 .../src/main/resources/functions/abort.sh          |   16 +++
 .../src/main/resources/functions/findPid.cmd       |   16 +++
 .../src/main/resources/functions/findPid.sh        |   16 +++
 .../src/main/resources/functions/forget.cmd        |   16 +++
 .../src/main/resources/functions/forget.sh         |   16 +++
 .../src/main/resources/functions/installGit.sh     |   16 +++
 .../main/resources/functions/installJDKFromURL.sh  |   16 +++
 .../src/main/resources/functions/installOpenJDK.sh |   16 +++
 .../src/main/resources/functions/nextMinute.cmd    |   16 +++
 .../main/resources/functions/setupPublicCurl.sh    |   16 +++
 .../src/main/resources/functions/sourceEnvFile.cmd |   16 +++
 .../src/main/resources/functions/sourceEnvFile.sh  |   16 +++
 .../src/main/resources/functions/stop.cmd          |   16 +++
 .../main/resources/functions/validateEnvFile.cmd   |   16 +++
 .../main/resources/functions/validateEnvFile.sh    |   16 +++
 scriptbuilder/src/test/resources/test_ebs.sh       |   48 +++++++
 scriptbuilder/src/test/resources/test_find_pid.cmd |   32 +++++
 scriptbuilder/src/test/resources/test_find_pid.sh  |   32 +++++
 scriptbuilder/src/test/resources/test_init.sh      |   48 +++++++
 .../src/test/resources/test_init_script.sh         |   82 ++++++++++++-
 .../resources/test_install_git_scriptbuilder.sh    |   98 ++++++++++++++-
 .../resources/test_install_jdk_scriptbuilder.sh    |   98 ++++++++++++++-
 scriptbuilder/src/test/resources/test_script.cmd   |   16 +++
 scriptbuilder/src/test/resources/test_script.sh    |   16 +++
 .../src/test/resources/test_seek_and_destroy.cmd   |   32 +++++
 .../src/test/resources/test_seek_and_destroy.sh    |   32 +++++
 .../servermanager/ServerManagerApiMetadata.java    |   18 +++
 360 files changed, 4500 insertions(+), 313 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java
index 69f90be..e8d8b84 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/filters/AddSessionKeyAndJSessionIdToRequest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.cloudstack.filters;
 
 import javax.inject.Inject;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java
index 8590393..5f486d0 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetFirewallRulesByVirtualMachine.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.cloudstack.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java
index d95eb38..ccde00a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/GetIPForwardingRulesByVirtualMachine.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.cloudstack.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java
index 62e89c7..d8f8b79 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/functions/ParseLoginResponseFromHttpResponse.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.cloudstack.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java
index fc2271f..68a2e31 100644
--- a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java
+++ b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java
@@ -9,11 +9,11 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unles required by applicable law or agreed to in writing,
+ * 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 expres or implied.  See the License for the
- * specific language governing permisions and limitations
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
  * under the License.
  */
 package org.jclouds.cloudwatch.features;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java
index 8045fee..209f5dc 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.ec2.xml;
 
 import static org.jclouds.util.SaxUtils.currentOrNegative;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java
index 23577e0..8d5ee1d 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.ec2.binders;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
index 267c6c4..e366945 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/SubnetApiExpectTest.java
@@ -9,11 +9,11 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unles required by applicable law or agreed to in writing,
+ * 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 expres or implied.  See the License for the
- * specific language governing permisions and limitations
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
  * under the License.
  */
 package org.jclouds.ec2.features;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java
index 1706e1b..bb48da7 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/TagApiExpectTest.java
@@ -9,11 +9,11 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unles required by applicable law or agreed to in writing,
+ * 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 expres or implied.  See the License for the
- * specific language governing permisions and limitations
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
  * under the License.
  */
 package org.jclouds.ec2.features;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiExpectTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiExpectTest.java
index 4e5b629..04abd53 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiExpectTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/WindowsApiExpectTest.java
@@ -9,11 +9,11 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unles required by applicable law or agreed to in writing,
+ * 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 expres or implied.  See the License for the
- * specific language governing permisions and limitations
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
  * under the License.
  */
 package org.jclouds.ec2.features;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java
index 14920e6..7127d17 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.ec2.internal;
 
 import org.jclouds.apis.BaseContextLiveTest;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ClientLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ClientLiveTest.java
index d704d94..65d67a3 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ClientLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ClientLiveTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.ec2.internal;
 
 import org.jclouds.apis.BaseContextLiveTest;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
index 9b2cc2e..724d967 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.cinder.v1.features;
 
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
index 53cf852..a8de3fd 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.cinder.v1.features;
 
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
index 7e8f8ef..e5e9833 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.cinder.v1.features;
 
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
index c5b9853..087005f 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Name 2.0 (the
+ * 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://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/RegionToAdminEndpointURI.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/RegionToAdminEndpointURI.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/RegionToAdminEndpointURI.java
index a98bf9d..aca5053 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/RegionToAdminEndpointURI.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/functions/RegionToAdminEndpointURI.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.keystone.v2_0.functions;
 
 import javax.inject.Inject;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java
index 2a9f61b..7bd85ec 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/suppliers/RegionIdToAdminURISupplier.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.keystone.v2_0.suppliers;
 
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java
index 1e5a3a6..a9b6697 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/ServiceType.java
@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Name 2.0 (the
+ * 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://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java
index a1e6b2f..9bc2339 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiExpectTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiLiveTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiLiveTest.java
index 5ab71a0..e60679b 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiLiveTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiLiveTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java
index f5e63a2..44c039c 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiExpectTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiLiveTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiLiveTest.java
index b12c5ae..4faabde 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiLiveTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApiLiveTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java
index 6d37a3d..3899228 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiExpectTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiLiveTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiLiveTest.java
index e3a4033..86a44d5 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiLiveTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TenantApiLiveTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java
index 9b59b98..f25b0f9 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiExpectTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiLiveTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiLiveTest.java
index 7328190..12442cc 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiLiveTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/TokenApiLiveTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java
index 104a96f..cebcbac 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiExpectTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiLiveTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiLiveTest.java
index cfb9661..aa0b5c1 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiLiveTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/features/UserApiLiveTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java
index 9478505..fc47244 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/internal/BaseKeystoneRestApiExpectTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java
index 0cc5f23..cb588c6 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseDevstackApiMetadataTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *   https://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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java
index 1983b1e..45b1425 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/parse/ParseRackspaceApiMetadataTest.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *   https://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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/ExtensionToNameSpaceTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/ExtensionToNameSpaceTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/ExtensionToNameSpaceTest.java
index 000c86a..acfd71b 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/ExtensionToNameSpaceTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/ExtensionToNameSpaceTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.v2_0.functions;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest.java
index 6e74370..55fb9c8 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/functions/PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSetTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.v2_0.functions;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/predicates/LinkPredicatesTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/predicates/LinkPredicatesTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/predicates/LinkPredicatesTest.java
index 7160e36..bc7dc0b 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/predicates/LinkPredicatesTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/predicates/LinkPredicatesTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.v2_0.predicates;
 
 import static org.jclouds.openstack.v2_0.predicates.LinkPredicates.hrefEquals;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestClientExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestClientExpectTest.java b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestClientExpectTest.java
index 11a7a09..fecb621 100644
--- a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestClientExpectTest.java
+++ b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/internal/BaseNovaEC2RestClientExpectTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.nova.ec2.internal;
 
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2InstanceClientExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2InstanceClientExpectTest.java b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2InstanceClientExpectTest.java
index 8f127ff..1cb0574 100644
--- a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2InstanceClientExpectTest.java
+++ b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2InstanceClientExpectTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.nova.ec2.services;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java
index c4f154d..5b8716f 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ExtensionNamespaces.java
@@ -3,7 +3,7 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Name 2.0 (the
+ * 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://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/FieldValueResponseParsers.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/FieldValueResponseParsers.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/FieldValueResponseParsers.java
index 6c37224..f82c918 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/FieldValueResponseParsers.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/FieldValueResponseParsers.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.nova.v2_0.functions;
 
 import org.jclouds.http.HttpResponse;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java
index d064dc8..aca7a65 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/functions/internal/ParseDiagnostics.java
@@ -1,17 +1,20 @@
-/*
- * Copyright 2012 jclouds.
- *
- * 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
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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
+ *   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.openstack.nova.v2_0.functions.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadataTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadataTest.java
index 237e2ef..803c015 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadataTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadataTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.nova.v2_0;
 
 import org.jclouds.compute.internal.BaseComputeServiceApiMetadataTest;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceLiveTest.java
index bf45d28..c3690f2 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceLiveTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 package org.jclouds.openstack.nova.v2_0.compute;
 
 import static java.util.logging.Logger.getAnonymousLogger;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java
index 5f1a763..15f4620 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDetailsEssexTest.java
@@ -9,7 +9,7 @@
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing)
+ * 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

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java
index 02383d9..e001746 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/parse/ParseServerDiagnostics.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds 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.
+ */
 /*
  * To change this template, choose Tools | Templates
  * and open the template in the editor.

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/70754d86/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiLiveTest.java b/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiLiveTest.java
index fae51ec..871c71b 100644
--- a/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiLiveTest.java
+++ b/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiLiveTest.java
@@ -3,11 +3,11 @@
  * contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 1.1 (the
+ * 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-1.1
+ *   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