You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2013/05/17 07:57:26 UTC

[6/9] git commit: JCLOUDS-63. updated to ASF headers via mvn com.mycila.maven-license-plugin:maven-license-plugin:format

JCLOUDS-63. updated to ASF headers via mvn com.mycila.maven-license-plugin:maven-license-plugin:format


Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/commit/03c628bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/tree/03c628bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/diff/03c628bd

Branch: refs/heads/master
Commit: 03c628bddfa5bceaa035113341f2ed7fc4e3c9a4
Parents: 622dfeb
Author: adriancole <ad...@gmail.com>
Authored: Thu May 16 22:40:50 2013 -0700
Committer: adriancole <ad...@gmail.com>
Committed: Thu May 16 22:56:33 2013 -0700

----------------------------------------------------------------------
 aws-elb/pom.xml                                    |   26 ++++++-------
 .../jclouds/aws/elb/AWSELBProviderMetadata.java    |   28 +++++++--------
 .../org/jclouds/aws/elb/AWSELBProviderTest.java    |   28 +++++++--------
 .../features/AWSAvailabilityZoneApiLiveTest.java   |   28 +++++++--------
 .../aws/elb/features/AWSInstanceApiLiveTest.java   |   28 +++++++--------
 .../elb/features/AWSLoadBalancerApiLiveTest.java   |   28 +++++++--------
 .../aws/elb/features/AWSPolicyApiLiveTest.java     |   28 +++++++--------
 .../AWSELBLoadBalancerServiceLiveTest.java         |   28 +++++++--------
 aws-iam/pom.xml                                    |   26 ++++++-------
 .../jclouds/aws/iam/AWSIAMProviderMetadata.java    |   28 +++++++--------
 .../org/jclouds/aws/iam/AWSIAMApiLiveTest.java     |   28 +++++++--------
 .../org/jclouds/aws/iam/AWSIAMProviderTest.java    |   28 +++++++--------
 .../features/AWSInstanceProfileApiLiveTest.java    |   28 +++++++--------
 .../aws/iam/features/AWSRoleApiLiveTest.java       |   28 +++++++--------
 .../aws/iam/features/AWSRolePolicyApiLiveTest.java |   28 +++++++--------
 .../aws/iam/features/AWSUserApiLiveTest.java       |   28 +++++++--------
 aws-rds/pom.xml                                    |   26 ++++++-------
 .../jclouds/aws/rds/AWSRDSProviderMetadata.java    |   28 +++++++--------
 .../org/jclouds/aws/rds/AWSRDSProviderTest.java    |   28 +++++++--------
 .../aws/rds/features/AWSInstanceApiLiveTest.java   |   28 +++++++--------
 .../rds/features/AWSSecurityGroupApiLiveTest.java  |   28 +++++++--------
 .../rds/features/AWSSubnetGroupApiLiveTest.java    |   28 +++++++--------
 elb/pom.xml                                        |   26 ++++++-------
 elb/src/main/java/org/jclouds/elb/ELBApi.java      |   28 +++++++--------
 .../main/java/org/jclouds/elb/ELBApiMetadata.java  |   28 +++++++--------
 .../BindAvailabilityZonesToIndexedFormParams.java  |   28 +++++++--------
 .../BindInstanceIdsToIndexedFormParams.java        |   28 +++++++--------
 .../elb/binders/BindListenersToFormParams.java     |   28 +++++++--------
 .../BindPolicyTypeNamesToIndexedFormParams.java    |   28 +++++++--------
 .../BindSecurityGroupsToIndexedFormParams.java     |   28 +++++++--------
 .../binders/BindSubnetsToIndexedFormParams.java    |   28 +++++++--------
 .../org/jclouds/elb/config/ELBHttpApiModule.java   |   28 +++++++--------
 .../org/jclouds/elb/domain/AttributeMetadata.java  |   28 +++++++--------
 .../java/org/jclouds/elb/domain/HealthCheck.java   |   28 +++++++--------
 .../org/jclouds/elb/domain/InstanceHealth.java     |   28 +++++++--------
 .../main/java/org/jclouds/elb/domain/Listener.java |   28 +++++++--------
 .../jclouds/elb/domain/ListenerWithPolicies.java   |   26 ++++++-------
 .../java/org/jclouds/elb/domain/LoadBalancer.java  |   28 +++++++--------
 .../main/java/org/jclouds/elb/domain/Policy.java   |   28 +++++++--------
 .../java/org/jclouds/elb/domain/PolicyType.java    |   28 +++++++--------
 .../main/java/org/jclouds/elb/domain/Protocol.java |   29 +++++++--------
 .../main/java/org/jclouds/elb/domain/Scheme.java   |   28 +++++++--------
 .../jclouds/elb/domain/SecurityGroupAndOwner.java  |   28 +++++++--------
 .../domain/regionscoped/LoadBalancerInRegion.java  |   16 ++++++++
 .../elb/domain/regionscoped/RegionAndName.java     |   28 +++++++--------
 .../jclouds/elb/features/AvailabilityZoneApi.java  |   28 +++++++--------
 .../java/org/jclouds/elb/features/InstanceApi.java |   28 +++++++--------
 .../org/jclouds/elb/features/LoadBalancerApi.java  |   28 +++++++--------
 .../java/org/jclouds/elb/features/PolicyApi.java   |   28 +++++++--------
 .../functions/LoadBalancersToPagedIterable.java    |   28 +++++++--------
 .../ELBBindLoadBalancerStrategiesByClass.java      |   28 +++++++--------
 .../config/ELBLoadBalancerContextModule.java       |   28 +++++++--------
 .../ELBLoadBalancerServiceDependenciesModule.java  |   28 +++++++--------
 .../LoadBalancerToLoadBalancerMetadata.java        |   28 +++++++--------
 .../strategy/ELBDestroyLoadBalancerStrategy.java   |   28 +++++++--------
 .../ELBGetLoadBalancerMetadataStrategy.java        |   28 +++++++--------
 .../strategy/ELBListLoadBalancersStrategy.java     |   28 +++++++--------
 .../strategy/ELBLoadBalanceNodesStrategy.java      |   28 +++++++--------
 .../elb/options/ListLoadBalancersOptions.java      |   28 +++++++--------
 .../jclouds/elb/options/ListPoliciesOptions.java   |   28 +++++++--------
 .../jclouds/elb/xml/AttributeMetadataHandler.java  |   28 +++++++--------
 .../elb/xml/AvailabilityZonesResultHandler.java    |   28 +++++++--------
 .../elb/xml/CreateLoadBalancerResponseHandler.java |   28 +++++++--------
 .../xml/DescribeInstanceHealthResultHandler.java   |   28 +++++++--------
 .../DescribeLoadBalancerPoliciesResultHandler.java |   28 +++++++--------
 ...scribeLoadBalancerPolicyTypesResultHandler.java |   28 +++++++--------
 .../xml/DescribeLoadBalancersResultHandler.java    |   28 +++++++--------
 .../org/jclouds/elb/xml/HealthCheckHandler.java    |   28 +++++++--------
 .../org/jclouds/elb/xml/InstanceStateHandler.java  |   28 +++++++--------
 .../jclouds/elb/xml/InstancesResultHandler.java    |   28 +++++++--------
 .../elb/xml/ListenerWithPoliciesHandler.java       |   28 +++++++--------
 .../org/jclouds/elb/xml/LoadBalancerHandler.java   |   28 +++++++--------
 .../java/org/jclouds/elb/xml/PolicyHandler.java    |   28 +++++++--------
 .../org/jclouds/elb/xml/PolicyTypeHandler.java     |   28 +++++++--------
 .../java/org/jclouds/elb/ELBApiMetadataTest.java   |   28 +++++++--------
 .../features/AvailabilityZoneApiExpectTest.java    |   28 +++++++--------
 .../elb/features/AvailabilityZoneApiLiveTest.java  |   28 +++++++--------
 .../elb/features/InstanceApiExpectTest.java        |   28 +++++++--------
 .../jclouds/elb/features/InstanceApiLiveTest.java  |   28 +++++++--------
 .../elb/features/LoadBalancerApiExpectTest.java    |   28 +++++++--------
 .../elb/features/LoadBalancerApiLiveTest.java      |   28 +++++++--------
 .../jclouds/elb/features/PolicyApiExpectTest.java  |   28 +++++++--------
 .../jclouds/elb/features/PolicyApiLiveTest.java    |   28 +++++++--------
 .../jclouds/elb/internal/BaseELBApiExpectTest.java |   28 +++++++--------
 .../jclouds/elb/internal/BaseELBApiLiveTest.java   |   28 +++++++--------
 .../jclouds/elb/internal/BaseELBExpectTest.java    |   28 +++++++--------
 .../ELBLoadBalancerServiceLiveTest.java            |   28 +++++++--------
 .../elb/options/ListLoadBalancersOptionsTest.java  |   28 +++++++--------
 .../elb/options/ListPoliciesOptionsTest.java       |   28 +++++++--------
 .../parse/AvailabilityZonesResultHandlerTest.java  |   28 +++++++--------
 .../parse/DescribeInstanceHealthResponseTest.java  |   28 +++++++--------
 .../DescribeLoadBalancerPoliciesResponseTest.java  |   28 +++++++--------
 ...escribeLoadBalancerPolicyTypesResponseTest.java |   28 +++++++--------
 .../parse/DescribeLoadBalancersResponseTest.java   |   28 +++++++--------
 .../DescribeVPCLoadBalancersResponseTest.java      |   28 +++++++--------
 .../elb/parse/GetLoadBalancerResponseTest.java     |   28 +++++++--------
 .../jclouds/elb/parse/GetPolicyResponseTest.java   |   28 +++++++--------
 .../elb/parse/GetPolicyTypeResponseTest.java       |   28 +++++++--------
 .../elb/parse/InstancesResultHandlerTest.java      |   28 +++++++--------
 iam/pom.xml                                        |   26 ++++++-------
 iam/src/main/java/org/jclouds/iam/IAMApi.java      |   28 +++++++--------
 .../main/java/org/jclouds/iam/IAMApiMetadata.java  |   28 +++++++--------
 .../org/jclouds/iam/config/IAMHttpApiModule.java   |   28 +++++++--------
 .../org/jclouds/iam/domain/InstanceProfile.java    |   28 +++++++--------
 .../main/java/org/jclouds/iam/domain/Policy.java   |   28 +++++++--------
 iam/src/main/java/org/jclouds/iam/domain/Role.java |   28 +++++++--------
 iam/src/main/java/org/jclouds/iam/domain/User.java |   28 +++++++--------
 .../jclouds/iam/features/InstanceProfileApi.java   |   28 +++++++--------
 .../java/org/jclouds/iam/features/PolicyApi.java   |   28 +++++++--------
 .../java/org/jclouds/iam/features/RoleApi.java     |   28 +++++++--------
 .../org/jclouds/iam/features/RolePolicyApi.java    |   27 +++++++-------
 .../java/org/jclouds/iam/features/UserApi.java     |   28 +++++++--------
 .../InstanceProfilesForRoleToPagedIterable.java    |   28 +++++++--------
 .../functions/InstanceProfilesToPagedIterable.java |   28 +++++++--------
 .../iam/functions/PoliciesToPagedIterable.java     |   28 +++++++--------
 .../iam/functions/RolesToPagedIterable.java        |   28 +++++++--------
 .../iam/functions/UsersToPagedIterable.java        |   28 +++++++--------
 .../jclouds/iam/xml/InstanceProfileHandler.java    |   28 +++++++--------
 .../iam/xml/ListInstanceProfilesResultHandler.java |   28 +++++++--------
 .../jclouds/iam/xml/ListPoliciesResultHandler.java |   28 +++++++--------
 .../jclouds/iam/xml/ListRolesResultHandler.java    |   28 +++++++--------
 .../jclouds/iam/xml/ListUsersResultHandler.java    |   28 +++++++--------
 .../java/org/jclouds/iam/xml/PolicyHandler.java    |   28 +++++++--------
 .../main/java/org/jclouds/iam/xml/RoleHandler.java |   28 +++++++--------
 .../main/java/org/jclouds/iam/xml/UserHandler.java |   28 +++++++--------
 .../test/java/org/jclouds/iam/IAMApiLiveTest.java  |   28 +++++++--------
 .../java/org/jclouds/iam/IAMApiMetadataTest.java   |   28 +++++++--------
 .../iam/features/InstanceProfileApiExpectTest.java |   28 +++++++--------
 .../iam/features/InstanceProfileApiLiveTest.java   |   28 +++++++--------
 .../jclouds/iam/features/RoleApiExpectTest.java    |   28 +++++++--------
 .../org/jclouds/iam/features/RoleApiLiveTest.java  |   28 +++++++--------
 .../iam/features/RolePolicyApiExpectTest.java      |   28 +++++++--------
 .../iam/features/RolePolicyApiLiveTest.java        |   28 +++++++--------
 .../jclouds/iam/features/UserApiExpectTest.java    |   28 +++++++--------
 .../org/jclouds/iam/features/UserApiLiveTest.java  |   28 +++++++--------
 .../jclouds/iam/internal/BaseIAMApiExpectTest.java |   28 +++++++--------
 .../jclouds/iam/internal/BaseIAMApiLiveTest.java   |   28 +++++++--------
 .../jclouds/iam/internal/BaseIAMExpectTest.java    |   28 +++++++--------
 .../iam/parse/GetInstanceProfileResponseTest.java  |   28 +++++++--------
 .../iam/parse/GetRolePolicyResponseTest.java       |   28 +++++++--------
 .../org/jclouds/iam/parse/GetRoleResponseTest.java |   28 +++++++--------
 .../org/jclouds/iam/parse/GetUserResponseTest.java |   28 +++++++--------
 .../parse/ListInstanceProfilesResponseTest.java    |   28 +++++++--------
 .../iam/parse/ListRolePoliciesResponseTest.java    |   28 +++++++--------
 .../jclouds/iam/parse/ListRolesResponseTest.java   |   28 +++++++--------
 .../jclouds/iam/parse/ListUsersResponseTest.java   |   28 +++++++--------
 rds/pom.xml                                        |   26 ++++++-------
 rds/src/main/java/org/jclouds/rds/RDSApi.java      |   28 +++++++--------
 .../main/java/org/jclouds/rds/RDSApiMetadata.java  |   28 +++++++--------
 .../main/java/org/jclouds/rds/RDSFallbacks.java    |   26 ++++++-------
 .../binders/BindInstanceRequestToFormParams.java   |   28 +++++++--------
 .../org/jclouds/rds/config/RDSHttpApiModule.java   |   28 +++++++--------
 .../java/org/jclouds/rds/domain/Authorization.java |   28 +++++++--------
 .../org/jclouds/rds/domain/EC2SecurityGroup.java   |   28 +++++++--------
 .../main/java/org/jclouds/rds/domain/IPRange.java  |   28 +++++++--------
 .../main/java/org/jclouds/rds/domain/Instance.java |   28 +++++++--------
 .../org/jclouds/rds/domain/InstanceRequest.java    |   28 +++++++--------
 .../java/org/jclouds/rds/domain/SecurityGroup.java |   28 +++++++--------
 .../main/java/org/jclouds/rds/domain/Subnet.java   |   28 +++++++--------
 .../java/org/jclouds/rds/domain/SubnetGroup.java   |   28 +++++++--------
 .../jclouds/rds/domain/internal/BaseInstance.java  |   28 +++++++--------
 .../java/org/jclouds/rds/features/InstanceApi.java |   28 +++++++--------
 .../org/jclouds/rds/features/SecurityGroupApi.java |   28 +++++++--------
 .../org/jclouds/rds/features/SubnetGroupApi.java   |   28 +++++++--------
 .../rds/functions/InstancesToPagedIterable.java    |   28 +++++++--------
 .../functions/SecurityGroupsToPagedIterable.java   |   28 +++++++--------
 .../rds/functions/SubnetGroupsToPagedIterable.java |   28 +++++++--------
 .../jclouds/rds/options/ListInstancesOptions.java  |   28 +++++++--------
 .../rds/options/ListSecurityGroupsOptions.java     |   28 +++++++--------
 .../rds/options/ListSubnetGroupsOptions.java       |   28 +++++++--------
 .../rds/xml/DescribeDBInstancesResultHandler.java  |   28 +++++++--------
 .../xml/DescribeDBSecurityGroupsResultHandler.java |   28 +++++++--------
 .../xml/DescribeDBSubnetGroupsResultHandler.java   |   28 +++++++--------
 .../jclouds/rds/xml/EC2SecurityGroupHandler.java   |   28 +++++++--------
 .../java/org/jclouds/rds/xml/IPRangeHandler.java   |   28 +++++++--------
 .../java/org/jclouds/rds/xml/InstanceHandler.java  |   28 +++++++--------
 .../org/jclouds/rds/xml/SecurityGroupHandler.java  |   28 +++++++--------
 .../org/jclouds/rds/xml/SubnetGroupHandler.java    |   28 +++++++--------
 .../java/org/jclouds/rds/xml/SubnetHandler.java    |   28 +++++++--------
 .../java/org/jclouds/rds/RDSApiMetadataTest.java   |   28 +++++++--------
 .../rds/features/InstanceApiExpectTest.java        |   28 +++++++--------
 .../jclouds/rds/features/InstanceApiLiveTest.java  |   28 +++++++--------
 .../rds/features/SecurityGroupApiExpectTest.java   |   28 +++++++--------
 .../rds/features/SecurityGroupApiLiveTest.java     |   28 +++++++--------
 .../rds/features/SubnetGroupApiExpectTest.java     |   28 +++++++--------
 .../rds/features/SubnetGroupApiLiveTest.java       |   28 +++++++--------
 .../jclouds/rds/internal/BaseRDSApiExpectTest.java |   28 +++++++--------
 .../jclouds/rds/internal/BaseRDSApiLiveTest.java   |   28 +++++++--------
 .../jclouds/rds/internal/BaseRDSExpectTest.java    |   28 +++++++--------
 .../rds/options/ListInstancesOptionsTest.java      |   28 +++++++--------
 .../rds/options/ListSecurityGroupsOptionsTest.java |   28 +++++++--------
 .../rds/options/ListSubnetGroupsOptionsTest.java   |   28 +++++++--------
 .../rds/parse/DescribeDBInstancesResponseTest.java |   28 +++++++--------
 .../DescribeDBSecurityGroupsResponseTest.java      |   28 +++++++--------
 .../parse/DescribeDBSubnetGroupsResponseTest.java  |   28 +++++++--------
 .../jclouds/rds/parse/GetInstanceResponseTest.java |   28 +++++++--------
 .../rds/parse/GetSecurityGroupResponseTest.java    |   28 +++++++--------
 .../rds/parse/GetSubnetGroupResponseTest.java      |   28 +++++++--------
 198 files changed, 2569 insertions(+), 2947 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-elb/pom.xml
----------------------------------------------------------------------
diff --git a/aws-elb/pom.xml b/aws-elb/pom.xml
index 57dbb7c..eb85d0b 100644
--- a/aws-elb/pom.xml
+++ b/aws-elb/pom.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-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
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+        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.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
----------------------------------------------------------------------
diff --git a/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java b/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
index 3e04029..e43b979 100644
--- a/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
+++ b/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.elb;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBProviderTest.java
----------------------------------------------------------------------
diff --git a/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBProviderTest.java b/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBProviderTest.java
index 2d1f4e9..5b6c78e 100644
--- a/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBProviderTest.java
+++ b/aws-elb/src/test/java/org/jclouds/aws/elb/AWSELBProviderTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.elb;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSAvailabilityZoneApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSAvailabilityZoneApiLiveTest.java b/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSAvailabilityZoneApiLiveTest.java
index 77f3b92..9b4de40 100644
--- a/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSAvailabilityZoneApiLiveTest.java
+++ b/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSAvailabilityZoneApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.elb.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSInstanceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSInstanceApiLiveTest.java b/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSInstanceApiLiveTest.java
index 5f6a794..4d2bafd 100644
--- a/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSInstanceApiLiveTest.java
+++ b/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSInstanceApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.elb.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSLoadBalancerApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSLoadBalancerApiLiveTest.java b/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSLoadBalancerApiLiveTest.java
index b6ab3f3..e4ffa0a 100644
--- a/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSLoadBalancerApiLiveTest.java
+++ b/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSLoadBalancerApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.elb.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSPolicyApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSPolicyApiLiveTest.java b/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSPolicyApiLiveTest.java
index f1bc742..0ef9b13 100644
--- a/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSPolicyApiLiveTest.java
+++ b/aws-elb/src/test/java/org/jclouds/aws/elb/features/AWSPolicyApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.elb.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-elb/src/test/java/org/jclouds/aws/elb/loadbalancer/AWSELBLoadBalancerServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-elb/src/test/java/org/jclouds/aws/elb/loadbalancer/AWSELBLoadBalancerServiceLiveTest.java b/aws-elb/src/test/java/org/jclouds/aws/elb/loadbalancer/AWSELBLoadBalancerServiceLiveTest.java
index 6e8b85b..79160af 100644
--- a/aws-elb/src/test/java/org/jclouds/aws/elb/loadbalancer/AWSELBLoadBalancerServiceLiveTest.java
+++ b/aws-elb/src/test/java/org/jclouds/aws/elb/loadbalancer/AWSELBLoadBalancerServiceLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.elb.loadbalancer;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-iam/pom.xml
----------------------------------------------------------------------
diff --git a/aws-iam/pom.xml b/aws-iam/pom.xml
index 623bb84..dcd5ba9 100644
--- a/aws-iam/pom.xml
+++ b/aws-iam/pom.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-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
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+        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.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java
----------------------------------------------------------------------
diff --git a/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java b/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java
index 03fa0dc..103bc84 100644
--- a/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java
+++ b/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.iam;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMApiLiveTest.java b/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMApiLiveTest.java
index bb7e734..2c0045b 100644
--- a/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMApiLiveTest.java
+++ b/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.iam;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMProviderTest.java
----------------------------------------------------------------------
diff --git a/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMProviderTest.java b/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMProviderTest.java
index 577a23e..9fa1b26 100644
--- a/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMProviderTest.java
+++ b/aws-iam/src/test/java/org/jclouds/aws/iam/AWSIAMProviderTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.iam;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSInstanceProfileApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSInstanceProfileApiLiveTest.java b/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSInstanceProfileApiLiveTest.java
index ae03a87..079507b 100644
--- a/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSInstanceProfileApiLiveTest.java
+++ b/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSInstanceProfileApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRoleApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRoleApiLiveTest.java b/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRoleApiLiveTest.java
index 5bc3d9b..be38dae 100644
--- a/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRoleApiLiveTest.java
+++ b/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRoleApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRolePolicyApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRolePolicyApiLiveTest.java b/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRolePolicyApiLiveTest.java
index 2539ebc..e6b5b11 100644
--- a/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRolePolicyApiLiveTest.java
+++ b/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSRolePolicyApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSUserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSUserApiLiveTest.java b/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSUserApiLiveTest.java
index 0b9bca7..dfa3b46 100644
--- a/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSUserApiLiveTest.java
+++ b/aws-iam/src/test/java/org/jclouds/aws/iam/features/AWSUserApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-rds/pom.xml
----------------------------------------------------------------------
diff --git a/aws-rds/pom.xml b/aws-rds/pom.xml
index 55ac074..aea5b16 100644
--- a/aws-rds/pom.xml
+++ b/aws-rds/pom.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-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
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+        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.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java b/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java
index 49ed90f..31cd0c4 100644
--- a/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java
+++ b/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.rds;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-rds/src/test/java/org/jclouds/aws/rds/AWSRDSProviderTest.java
----------------------------------------------------------------------
diff --git a/aws-rds/src/test/java/org/jclouds/aws/rds/AWSRDSProviderTest.java b/aws-rds/src/test/java/org/jclouds/aws/rds/AWSRDSProviderTest.java
index 506d9fd..a36977a 100644
--- a/aws-rds/src/test/java/org/jclouds/aws/rds/AWSRDSProviderTest.java
+++ b/aws-rds/src/test/java/org/jclouds/aws/rds/AWSRDSProviderTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.rds;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSInstanceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSInstanceApiLiveTest.java b/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSInstanceApiLiveTest.java
index b26c2d0..da83c57 100644
--- a/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSInstanceApiLiveTest.java
+++ b/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSInstanceApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSecurityGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSecurityGroupApiLiveTest.java b/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSecurityGroupApiLiveTest.java
index 00da537..1e4e080 100644
--- a/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSecurityGroupApiLiveTest.java
+++ b/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSecurityGroupApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSubnetGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSubnetGroupApiLiveTest.java b/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSubnetGroupApiLiveTest.java
index 7db1c61..8718dde 100644
--- a/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSubnetGroupApiLiveTest.java
+++ b/aws-rds/src/test/java/org/jclouds/aws/rds/features/AWSSubnetGroupApiLiveTest.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.aws.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/pom.xml
----------------------------------------------------------------------
diff --git a/elb/pom.xml b/elb/pom.xml
index 89f3968..eb05001 100644
--- a/elb/pom.xml
+++ b/elb/pom.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-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
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+        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.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/ELBApi.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/ELBApi.java b/elb/src/main/java/org/jclouds/elb/ELBApi.java
index 2d0967a..4414f9b 100644
--- a/elb/src/main/java/org/jclouds/elb/ELBApi.java
+++ b/elb/src/main/java/org/jclouds/elb/ELBApi.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java b/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java
index 19de79a..af463c7 100644
--- a/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java
+++ b/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/binders/BindAvailabilityZonesToIndexedFormParams.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/binders/BindAvailabilityZonesToIndexedFormParams.java b/elb/src/main/java/org/jclouds/elb/binders/BindAvailabilityZonesToIndexedFormParams.java
index 28c93bd..62e4a15 100644
--- a/elb/src/main/java/org/jclouds/elb/binders/BindAvailabilityZonesToIndexedFormParams.java
+++ b/elb/src/main/java/org/jclouds/elb/binders/BindAvailabilityZonesToIndexedFormParams.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb.binders;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/binders/BindInstanceIdsToIndexedFormParams.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/binders/BindInstanceIdsToIndexedFormParams.java b/elb/src/main/java/org/jclouds/elb/binders/BindInstanceIdsToIndexedFormParams.java
index 0c7cfe5..5c48f4f 100644
--- a/elb/src/main/java/org/jclouds/elb/binders/BindInstanceIdsToIndexedFormParams.java
+++ b/elb/src/main/java/org/jclouds/elb/binders/BindInstanceIdsToIndexedFormParams.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb.binders;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/binders/BindListenersToFormParams.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/binders/BindListenersToFormParams.java b/elb/src/main/java/org/jclouds/elb/binders/BindListenersToFormParams.java
index 4998136..c0bc295 100644
--- a/elb/src/main/java/org/jclouds/elb/binders/BindListenersToFormParams.java
+++ b/elb/src/main/java/org/jclouds/elb/binders/BindListenersToFormParams.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb.binders;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/binders/BindPolicyTypeNamesToIndexedFormParams.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/binders/BindPolicyTypeNamesToIndexedFormParams.java b/elb/src/main/java/org/jclouds/elb/binders/BindPolicyTypeNamesToIndexedFormParams.java
index f6e828f..7b3eeb2 100644
--- a/elb/src/main/java/org/jclouds/elb/binders/BindPolicyTypeNamesToIndexedFormParams.java
+++ b/elb/src/main/java/org/jclouds/elb/binders/BindPolicyTypeNamesToIndexedFormParams.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb.binders;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/binders/BindSecurityGroupsToIndexedFormParams.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/binders/BindSecurityGroupsToIndexedFormParams.java b/elb/src/main/java/org/jclouds/elb/binders/BindSecurityGroupsToIndexedFormParams.java
index 0dd9e34..2092fc6 100644
--- a/elb/src/main/java/org/jclouds/elb/binders/BindSecurityGroupsToIndexedFormParams.java
+++ b/elb/src/main/java/org/jclouds/elb/binders/BindSecurityGroupsToIndexedFormParams.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb.binders;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/binders/BindSubnetsToIndexedFormParams.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/binders/BindSubnetsToIndexedFormParams.java b/elb/src/main/java/org/jclouds/elb/binders/BindSubnetsToIndexedFormParams.java
index 658a606..9801e7d 100644
--- a/elb/src/main/java/org/jclouds/elb/binders/BindSubnetsToIndexedFormParams.java
+++ b/elb/src/main/java/org/jclouds/elb/binders/BindSubnetsToIndexedFormParams.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb.binders;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/config/ELBHttpApiModule.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/config/ELBHttpApiModule.java b/elb/src/main/java/org/jclouds/elb/config/ELBHttpApiModule.java
index c844241..2d114f5 100644
--- a/elb/src/main/java/org/jclouds/elb/config/ELBHttpApiModule.java
+++ b/elb/src/main/java/org/jclouds/elb/config/ELBHttpApiModule.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb.config;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java b/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java
index 648dc87..2fd2ee2 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/AttributeMetadata.java
@@ -1,20 +1,18 @@
-/**
- * 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
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     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.elb.domain;