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 17:42:27 UTC
[5/5] git commit: JCLOUDS-37. Fix RAT violations in incubator-jclouds,
master branch
JCLOUDS-37. Fix RAT violations in incubator-jclouds, master 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/7923009e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/7923009e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/7923009e
Branch: refs/heads/master
Commit: 7923009eb57595b702ac68f28e81f97a5b0f373e
Parents: fb1980f
Author: Andrew Bayer <an...@gmail.com>
Authored: Mon May 13 16:53:14 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Mon May 13 19:17:50 2013 -0700
----------------------------------------------------------------------
.../AddSessionKeyAndJSessionIdToRequest.java | 18 +++
.../GetFirewallRulesByVirtualMachine.java | 18 +++
.../GetIPForwardingRulesByVirtualMachine.java | 18 +++
.../ParseLoginResponseFromHttpResponse.java | 18 +++
.../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 +++
.../openstack/cinder/v1/features/SnapshotApi.java | 18 +++
.../openstack/cinder/v1/features/VolumeApi.java | 18 +++
.../cinder/v1/features/VolumeTypeApi.java | 18 +++
.../v2_0/functions/RegionToAdminEndpointURI.java | 18 +++
.../v2_0/suppliers/RegionIdToAdminURISupplier.java | 18 +++
.../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 +++
.../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 | 4 +-
.../nova/v2_0/parse/ParseServerDiagnostics.java | 18 +++
.../rackspace/clouddns/v1/domain/CreateDomain.java | 2 +-
.../clouddns/v1/domain/CreateSubdomain.java | 2 +-
.../rackspace/clouddns/v1/domain/DomainChange.java | 2 +-
.../jclouds/rackspace/clouddns/v1/domain/Job.java | 18 +++
.../rackspace/clouddns/v1/domain/Subdomain.java | 2 +-
.../rackspace/clouddns/v1/domain/UpdateDomain.java | 2 +-
.../rackspace/clouddns/v1/features/DomainApi.java | 2 +-
.../rackspace/clouddns/v1/features/LimitApi.java | 2 +-
.../clouddns/v1/features/ReverseDNSApi.java | 2 +-
.../v2_0/CloudIdentityApiLiveTest.java | 4 +-
.../features/CloudIdentityServiceApiLiveTest.java | 4 +-
.../features/CloudIdentityTenantApiLiveTest.java | 4 +-
.../features/CloudIdentityTokenApiLiveTest.java | 4 +-
.../features/CloudIdentityUserApiLiveTest.java | 4 +-
.../v1/domain/SessionPersistence.java | 18 +++
.../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 +++
.../internal/AsyncMultipartUploadStrategy.java | 18 +++
.../internal/ParallelMultipartUploadStrategy.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 +++
.../v1_1/functions/PublicURLOrInternalIfNull.java | 13 +--
.../internal/BaseKeystoneRestClientExpectTest.java | 4 +-
.../openstack/predicates/LinkPredicatesTest.java | 18 +++
.../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 +++
.../org/jclouds/compute/util/OpenSocketFinder.java | 18 +++
.../BaseComputeServiceApiMetadataTest.java | 18 +++
...ndAppendUniqueStringToThoseWhichRepeatTest.java | 2 +-
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 +++++++
.../config/ScheduledExecutorServiceModule.java | 18 +++
.../java/org/jclouds/io/ContentMetadataCodec.java | 18 +++
.../org/jclouds/rest/config/InvocationConfig.java | 2 +-
.../rest/config/ReadAnnotationsAndProperties.java | 2 +-
.../collect/AdvanceUntilEmptyIterableTest.java | 2 +-
.../jclouds/collect/IterableWithMarkersTest.java | 18 +++
.../org/jclouds/collect/PagedIterablesTest.java | 2 +-
.../collect/internal/Arg0ToPagedIterableTest.java | 2 +-
.../fallbacks/HeaderToRetryAfterExceptionTest.java | 2 +-
.../config/ReadAnnotationsAndPropertiesTest.java | 2 +-
.../java/org/jclouds/gae/GaeSocketOpenTest.java | 18 +++
pom.xml | 7 +-
.../org/jclouds/aws/s3/xml/ErrorEntryHandler.java | 18 +++
.../dynect/v3/domain/CreatePrimaryZone.java | 2 +-
.../org/jclouds/dynect/v3/domain/CreateRecord.java | 2 +-
.../jclouds/dynect/v3/domain/GeoRegionGroup.java | 2 +-
.../org/jclouds/dynect/v3/domain/GeoService.java | 2 +-
.../java/org/jclouds/dynect/v3/domain/Node.java | 2 +-
.../java/org/jclouds/dynect/v3/domain/Record.java | 2 +-
.../org/jclouds/dynect/v3/domain/RecordId.java | 2 +-
.../org/jclouds/dynect/v3/domain/RecordSet.java | 18 +++
.../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/SPFData.java | 18 +++
.../jclouds/dynect/v3/domain/rdata/SRVData.java | 2 +-
.../jclouds/dynect/v3/domain/rdata/SSHFPData.java | 18 +++
.../jclouds/dynect/v3/domain/rdata/TXTData.java | 2 +-
.../org/jclouds/dynect/v3/features/RecordApi.java | 2 +-
.../org/jclouds/dynect/v3/features/ZoneApi.java | 2 +-
.../v3/functions/ExtractLastPathComponent.java | 2 +-
.../jclouds/dynect/v3/functions/ToRecordIds.java | 2 +-
.../dynect/v3/predicates/RecordPredicates.java | 2 +-
.../v3/features/GeoRegionGroupApiExpectTest.java | 2 +-
.../v3/features/GeoRegionGroupApiLiveTest.java | 4 +-
.../v3/features/GeoServiceApiExpectTest.java | 2 +-
.../dynect/v3/features/GeoServiceApiLiveTest.java | 4 +-
.../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 +++
.../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 +-
.../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 +-
.../trmk/ecloud/TerremarkECloudApiMetadata.java | 18 +++
.../CreateInternetService-options-test.xml | 20 +++
.../jclouds/ultradns/ws/UltraDNSWSExceptions.java | 5 +-
.../ultradns/ws/UltraDNSWSApiExpectTest.java | 6 +-
.../ws/features/DirectionalGroupApiLiveTest.java | 2 +-
.../ws/features/DirectionalPoolApiLiveTest.java | 2 +-
.../features/TrafficControllerPoolApiLiveTest.java | 2 +-
.../ws/internal/BaseDirectionalApiLiveTest.java | 2 +-
...tAccountLevelDirectionalGroupsResponseTest.java | 2 +-
.../ws/parse/GetAvailableGroupsResponseTest.java | 2 +-
.../GetDirectionalDNSGroupDetailsResponseTest.java | 2 +-
.../GetDirectionalPoolsByZoneResponseTest.java | 2 +-
.../GetTCLoadBalancingPoolsByZoneResponseTest.java | 2 +-
resources/checkstyle.xml | 20 +++
resources/checkstyle_suppressions.xml | 20 +++
.../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/installRuby.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 ++++++++++++-
.../test_install_chef_gems_scriptbuilder.sh | 48 +++++++
.../resources/test_install_git_scriptbuilder.sh | 98 ++++++++++++++-
.../resources/test_install_jdk_scriptbuilder.sh | 98 ++++++++++++++-
.../resources/test_install_ruby_scriptbuilder.sh | 98 ++++++++++++++-
.../test_install_rubygems_scriptbuilder.sh | 48 +++++++
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 +++
221 files changed, 2922 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/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 30af1e2..cff646a 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/7923009e/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 ff71745..e87037b 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/7923009e/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/7923009e/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/7923009e/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 9174902..c9cd0ac 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.currentOrNull;
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/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 10c5e9e..0a9bd3b 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/7923009e/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 a81d2fa..d952073 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/7923009e/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 7364945..f72927d 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/7923009e/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/7923009e/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 3446963..926973d 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.BaseApiLiveTest;
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/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 8fb7544..a14cc08 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 org.jclouds.openstack.cinder.v1.domain.Snapshot;
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/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 e4e1649..4d31f07 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 org.jclouds.openstack.cinder.v1.domain.Volume;
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/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 821205d..c62442a 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 org.jclouds.openstack.cinder.v1.domain.VolumeType;
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/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/7923009e/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/7923009e/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 37f2337..6570fb1 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/7923009e/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 eae9c21..e5bfd34 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/7923009e/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 0ac255c..996dcb0 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/7923009e/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 417e599..38b502d 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/7923009e/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 9ace238..f405e8b 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/7923009e/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 402789a..4002c8b 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/7923009e/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 07f08f4..8b7c7b5 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/7923009e/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 5a86960..47f5b5b 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/7923009e/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 0b1a8e2..32b3741 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/7923009e/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 df48aed..b45ae1c 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/7923009e/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 51baeb9..55f1ad8 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/7923009e/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/7923009e/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/7923009e/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/7923009e/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 0f99fd1..c77e857 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.jclouds.reflect.Reflection2.method;
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/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/7923009e/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/7923009e/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/7923009e/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 382437a..605a56a 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/7923009e/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..e58f22e 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/7923009e/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/7923009e/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 44d5876..e09c7cd 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/7923009e/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..8bc6082 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
@@ -7,9 +7,9 @@
* "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)
+ * 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/7923009e/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 3d0bb71..4ecdc55 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/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java
index 8f8a0ae..10aa69a 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.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, String 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/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java
index da94cb5..86583dd 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.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, String 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/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java
index 6e134ca..9bc2240 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.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, String 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/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java
index fc8d79f..fa19c33 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.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.rackspace.clouddns.v1.domain;
import static com.google.common.base.Objects.toStringHelper;
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java
index 097c859..ba02573 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.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, String 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/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java
index ebd0b50..59afa93 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.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, String 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/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java
index 494c313..00b2903 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/DomainApi.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, String 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/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java
index e911f9f..2a1ab4f 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/LimitApi.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, String 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/7923009e/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java
index fad6841..0fc69d1 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/features/ReverseDNSApi.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, String 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/7923009e/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
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/7923009e/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceApiLiveTest.java b/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceApiLiveTest.java
index de9b8ed..7f4f566 100644
--- a/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceApiLiveTest.java
+++ b/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityServiceApiLiveTest.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/7923009e/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantApiLiveTest.java b/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantApiLiveTest.java
index bc75290..4f7dc0d 100644
--- a/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantApiLiveTest.java
+++ b/apis/rackspace-cloudidentity/src/test/java/org/jclouds/rackspace/cloudidentity/v2_0/features/CloudIdentityTenantApiLiveTest.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