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:21 UTC

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

Updated Branches:
  refs/heads/master 5655b6ff6 -> 03c628bdd


http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSecurityGroupsResponseTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSecurityGroupsResponseTest.java b/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSecurityGroupsResponseTest.java
index 8a48714..3ead966 100644
--- a/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSecurityGroupsResponseTest.java
+++ b/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSecurityGroupsResponseTest.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.rds.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSubnetGroupsResponseTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSubnetGroupsResponseTest.java b/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSubnetGroupsResponseTest.java
index 5bba45e..9dc94ac 100644
--- a/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSubnetGroupsResponseTest.java
+++ b/rds/src/test/java/org/jclouds/rds/parse/DescribeDBSubnetGroupsResponseTest.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.rds.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/parse/GetInstanceResponseTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/parse/GetInstanceResponseTest.java b/rds/src/test/java/org/jclouds/rds/parse/GetInstanceResponseTest.java
index 2c47ea9..66f9627 100644
--- a/rds/src/test/java/org/jclouds/rds/parse/GetInstanceResponseTest.java
+++ b/rds/src/test/java/org/jclouds/rds/parse/GetInstanceResponseTest.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.rds.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/parse/GetSecurityGroupResponseTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/parse/GetSecurityGroupResponseTest.java b/rds/src/test/java/org/jclouds/rds/parse/GetSecurityGroupResponseTest.java
index d6bdb77..51a467c 100644
--- a/rds/src/test/java/org/jclouds/rds/parse/GetSecurityGroupResponseTest.java
+++ b/rds/src/test/java/org/jclouds/rds/parse/GetSecurityGroupResponseTest.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.rds.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/parse/GetSubnetGroupResponseTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/parse/GetSubnetGroupResponseTest.java b/rds/src/test/java/org/jclouds/rds/parse/GetSubnetGroupResponseTest.java
index 15e4017..d1f61f9 100644
--- a/rds/src/test/java/org/jclouds/rds/parse/GetSubnetGroupResponseTest.java
+++ b/rds/src/test/java/org/jclouds/rds/parse/GetSubnetGroupResponseTest.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.rds.parse;

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

Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/PolicyTypeHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/PolicyTypeHandler.java b/elb/src/main/java/org/jclouds/elb/xml/PolicyTypeHandler.java
index 8f9441f..9301d9b 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/PolicyTypeHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/PolicyTypeHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/ELBApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/ELBApiMetadataTest.java b/elb/src/test/java/org/jclouds/elb/ELBApiMetadataTest.java
index b0fc950..ff16058 100644
--- a/elb/src/test/java/org/jclouds/elb/ELBApiMetadataTest.java
+++ b/elb/src/test/java/org/jclouds/elb/ELBApiMetadataTest.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/test/java/org/jclouds/elb/features/AvailabilityZoneApiExpectTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiExpectTest.java b/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiExpectTest.java
index 1230bf7..d3384bd 100644
--- a/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiExpectTest.java
+++ b/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiExpectTest.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
  *
- * Unles 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
- * 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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiLiveTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiLiveTest.java b/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiLiveTest.java
index ff20268..e38c0f6 100644
--- a/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiLiveTest.java
+++ b/elb/src/test/java/org/jclouds/elb/features/AvailabilityZoneApiLiveTest.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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/features/InstanceApiExpectTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/features/InstanceApiExpectTest.java b/elb/src/test/java/org/jclouds/elb/features/InstanceApiExpectTest.java
index 5a05d69..32a37bb 100644
--- a/elb/src/test/java/org/jclouds/elb/features/InstanceApiExpectTest.java
+++ b/elb/src/test/java/org/jclouds/elb/features/InstanceApiExpectTest.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
  *
- * Unles 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
- * 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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/features/InstanceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/features/InstanceApiLiveTest.java b/elb/src/test/java/org/jclouds/elb/features/InstanceApiLiveTest.java
index 72d4b68..cb436cd 100644
--- a/elb/src/test/java/org/jclouds/elb/features/InstanceApiLiveTest.java
+++ b/elb/src/test/java/org/jclouds/elb/features/InstanceApiLiveTest.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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiExpectTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiExpectTest.java b/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiExpectTest.java
index f73401b..895a542 100644
--- a/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiExpectTest.java
+++ b/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiExpectTest.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
  *
- * Unles 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
- * 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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiLiveTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiLiveTest.java b/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiLiveTest.java
index d1a9de6..ff1202a 100644
--- a/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiLiveTest.java
+++ b/elb/src/test/java/org/jclouds/elb/features/LoadBalancerApiLiveTest.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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/features/PolicyApiExpectTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/features/PolicyApiExpectTest.java b/elb/src/test/java/org/jclouds/elb/features/PolicyApiExpectTest.java
index e9499c5..9f3e825 100644
--- a/elb/src/test/java/org/jclouds/elb/features/PolicyApiExpectTest.java
+++ b/elb/src/test/java/org/jclouds/elb/features/PolicyApiExpectTest.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
  *
- * Unles 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
- * 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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/features/PolicyApiLiveTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/features/PolicyApiLiveTest.java b/elb/src/test/java/org/jclouds/elb/features/PolicyApiLiveTest.java
index b2b7f6f..1cc5a91 100644
--- a/elb/src/test/java/org/jclouds/elb/features/PolicyApiLiveTest.java
+++ b/elb/src/test/java/org/jclouds/elb/features/PolicyApiLiveTest.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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiExpectTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiExpectTest.java b/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiExpectTest.java
index 2f358ef..ef12e78 100644
--- a/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiExpectTest.java
+++ b/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiExpectTest.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.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiLiveTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiLiveTest.java b/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiLiveTest.java
index 38243d3..0cbb693 100644
--- a/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiLiveTest.java
+++ b/elb/src/test/java/org/jclouds/elb/internal/BaseELBApiLiveTest.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.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/internal/BaseELBExpectTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/internal/BaseELBExpectTest.java b/elb/src/test/java/org/jclouds/elb/internal/BaseELBExpectTest.java
index 6790a2b..02bbd55 100644
--- a/elb/src/test/java/org/jclouds/elb/internal/BaseELBExpectTest.java
+++ b/elb/src/test/java/org/jclouds/elb/internal/BaseELBExpectTest.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.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/loadbalancer/ELBLoadBalancerServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/loadbalancer/ELBLoadBalancerServiceLiveTest.java b/elb/src/test/java/org/jclouds/elb/loadbalancer/ELBLoadBalancerServiceLiveTest.java
index 04d40c6..b4dbdd5 100644
--- a/elb/src/test/java/org/jclouds/elb/loadbalancer/ELBLoadBalancerServiceLiveTest.java
+++ b/elb/src/test/java/org/jclouds/elb/loadbalancer/ELBLoadBalancerServiceLiveTest.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.loadbalancer;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/options/ListLoadBalancersOptionsTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/options/ListLoadBalancersOptionsTest.java b/elb/src/test/java/org/jclouds/elb/options/ListLoadBalancersOptionsTest.java
index b97dd68..3a552d2 100644
--- a/elb/src/test/java/org/jclouds/elb/options/ListLoadBalancersOptionsTest.java
+++ b/elb/src/test/java/org/jclouds/elb/options/ListLoadBalancersOptionsTest.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.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/options/ListPoliciesOptionsTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/options/ListPoliciesOptionsTest.java b/elb/src/test/java/org/jclouds/elb/options/ListPoliciesOptionsTest.java
index dcfe15e..5354015 100644
--- a/elb/src/test/java/org/jclouds/elb/options/ListPoliciesOptionsTest.java
+++ b/elb/src/test/java/org/jclouds/elb/options/ListPoliciesOptionsTest.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.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/AvailabilityZonesResultHandlerTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/AvailabilityZonesResultHandlerTest.java b/elb/src/test/java/org/jclouds/elb/parse/AvailabilityZonesResultHandlerTest.java
index dd1a3f6..3054063 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/AvailabilityZonesResultHandlerTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/AvailabilityZonesResultHandlerTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/DescribeInstanceHealthResponseTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/DescribeInstanceHealthResponseTest.java b/elb/src/test/java/org/jclouds/elb/parse/DescribeInstanceHealthResponseTest.java
index 394fb33..319918e 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/DescribeInstanceHealthResponseTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/DescribeInstanceHealthResponseTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPoliciesResponseTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPoliciesResponseTest.java b/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPoliciesResponseTest.java
index b28f0fc..145be8c 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPoliciesResponseTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPoliciesResponseTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPolicyTypesResponseTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPolicyTypesResponseTest.java b/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPolicyTypesResponseTest.java
index efd5458..6d33387 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPolicyTypesResponseTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancerPolicyTypesResponseTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancersResponseTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancersResponseTest.java b/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancersResponseTest.java
index cd6c37a..49960ce 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancersResponseTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/DescribeLoadBalancersResponseTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/DescribeVPCLoadBalancersResponseTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/DescribeVPCLoadBalancersResponseTest.java b/elb/src/test/java/org/jclouds/elb/parse/DescribeVPCLoadBalancersResponseTest.java
index a2e4229..86ff1db 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/DescribeVPCLoadBalancersResponseTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/DescribeVPCLoadBalancersResponseTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/GetLoadBalancerResponseTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/GetLoadBalancerResponseTest.java b/elb/src/test/java/org/jclouds/elb/parse/GetLoadBalancerResponseTest.java
index 8496ab8..4a77f0c 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/GetLoadBalancerResponseTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/GetLoadBalancerResponseTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/GetPolicyResponseTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/GetPolicyResponseTest.java b/elb/src/test/java/org/jclouds/elb/parse/GetPolicyResponseTest.java
index 25813c1..bf2cb28 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/GetPolicyResponseTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/GetPolicyResponseTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/GetPolicyTypeResponseTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/GetPolicyTypeResponseTest.java b/elb/src/test/java/org/jclouds/elb/parse/GetPolicyTypeResponseTest.java
index 04fd370..3e3e384 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/GetPolicyTypeResponseTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/GetPolicyTypeResponseTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/test/java/org/jclouds/elb/parse/InstancesResultHandlerTest.java
----------------------------------------------------------------------
diff --git a/elb/src/test/java/org/jclouds/elb/parse/InstancesResultHandlerTest.java b/elb/src/test/java/org/jclouds/elb/parse/InstancesResultHandlerTest.java
index 28af89e..71bc2f0 100644
--- a/elb/src/test/java/org/jclouds/elb/parse/InstancesResultHandlerTest.java
+++ b/elb/src/test/java/org/jclouds/elb/parse/InstancesResultHandlerTest.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.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/pom.xml
----------------------------------------------------------------------
diff --git a/iam/pom.xml b/iam/pom.xml
index 05520af..2f16dab 100644
--- a/iam/pom.xml
+++ b/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/iam/src/main/java/org/jclouds/iam/IAMApi.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/IAMApi.java b/iam/src/main/java/org/jclouds/iam/IAMApi.java
index 03691c3..78bbe87 100644
--- a/iam/src/main/java/org/jclouds/iam/IAMApi.java
+++ b/iam/src/main/java/org/jclouds/iam/IAMApi.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.iam;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.java b/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.java
index f2fd606..b1667a3 100644
--- a/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.java
+++ b/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.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.iam;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/config/IAMHttpApiModule.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/config/IAMHttpApiModule.java b/iam/src/main/java/org/jclouds/iam/config/IAMHttpApiModule.java
index e7ed250..9949bd9 100644
--- a/iam/src/main/java/org/jclouds/iam/config/IAMHttpApiModule.java
+++ b/iam/src/main/java/org/jclouds/iam/config/IAMHttpApiModule.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.iam.config;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java b/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java
index 2e1d956..6b83081 100644
--- a/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.java
+++ b/iam/src/main/java/org/jclouds/iam/domain/InstanceProfile.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.iam.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/domain/Policy.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/domain/Policy.java b/iam/src/main/java/org/jclouds/iam/domain/Policy.java
index a2d353c..eb082fd 100644
--- a/iam/src/main/java/org/jclouds/iam/domain/Policy.java
+++ b/iam/src/main/java/org/jclouds/iam/domain/Policy.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.iam.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/domain/Role.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/domain/Role.java b/iam/src/main/java/org/jclouds/iam/domain/Role.java
index 9e9f39a..8f5499a 100644
--- a/iam/src/main/java/org/jclouds/iam/domain/Role.java
+++ b/iam/src/main/java/org/jclouds/iam/domain/Role.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.iam.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/domain/User.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/domain/User.java b/iam/src/main/java/org/jclouds/iam/domain/User.java
index 0033555..3df4de3 100644
--- a/iam/src/main/java/org/jclouds/iam/domain/User.java
+++ b/iam/src/main/java/org/jclouds/iam/domain/User.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.iam.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/features/InstanceProfileApi.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/features/InstanceProfileApi.java b/iam/src/main/java/org/jclouds/iam/features/InstanceProfileApi.java
index f12f4ed..a54c1d4 100644
--- a/iam/src/main/java/org/jclouds/iam/features/InstanceProfileApi.java
+++ b/iam/src/main/java/org/jclouds/iam/features/InstanceProfileApi.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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/features/PolicyApi.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/features/PolicyApi.java b/iam/src/main/java/org/jclouds/iam/features/PolicyApi.java
index 6f445b7..1412a2a 100644
--- a/iam/src/main/java/org/jclouds/iam/features/PolicyApi.java
+++ b/iam/src/main/java/org/jclouds/iam/features/PolicyApi.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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/features/RoleApi.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/features/RoleApi.java b/iam/src/main/java/org/jclouds/iam/features/RoleApi.java
index 0730ab1..d1b4ea4 100644
--- a/iam/src/main/java/org/jclouds/iam/features/RoleApi.java
+++ b/iam/src/main/java/org/jclouds/iam/features/RoleApi.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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/features/RolePolicyApi.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/features/RolePolicyApi.java b/iam/src/main/java/org/jclouds/iam/features/RolePolicyApi.java
index 7797865..52b7f80 100644
--- a/iam/src/main/java/org/jclouds/iam/features/RolePolicyApi.java
+++ b/iam/src/main/java/org/jclouds/iam/features/RolePolicyApi.java
@@ -1,19 +1,18 @@
-/**
- * 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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/features/UserApi.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/features/UserApi.java b/iam/src/main/java/org/jclouds/iam/features/UserApi.java
index 0e40226..13dbd13 100644
--- a/iam/src/main/java/org/jclouds/iam/features/UserApi.java
+++ b/iam/src/main/java/org/jclouds/iam/features/UserApi.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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesForRoleToPagedIterable.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesForRoleToPagedIterable.java b/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesForRoleToPagedIterable.java
index b91fd56..62399cf 100644
--- a/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesForRoleToPagedIterable.java
+++ b/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesForRoleToPagedIterable.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.iam.functions;

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

Posted by ad...@apache.org.
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;

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

Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java b/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java
index b7c3af6..0fce4f1 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/HealthCheck.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java b/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java
index 36101d3..6314989 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/InstanceHealth.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/Listener.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/Listener.java b/elb/src/main/java/org/jclouds/elb/domain/Listener.java
index acf5c1e..768c081 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/Listener.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/Listener.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java b/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java
index c98c16c..2207411 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/ListenerWithPolicies.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java b/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java
index 0b0ccfd..e5bc7de 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/LoadBalancer.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/Policy.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/Policy.java b/elb/src/main/java/org/jclouds/elb/domain/Policy.java
index ad7b3ae..3986277 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/Policy.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/Policy.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java b/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java
index 49c21d0..5693354 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/PolicyType.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/PolicyType.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/Protocol.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/Protocol.java b/elb/src/main/java/org/jclouds/elb/domain/Protocol.java
index 508386c..c65fd8a 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/Protocol.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/Protocol.java
@@ -1,22 +1,19 @@
-/**
- * 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;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/Scheme.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/Scheme.java b/elb/src/main/java/org/jclouds/elb/domain/Scheme.java
index 2477280..8d5bcc7 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/Scheme.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/Scheme.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java b/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java
index 36948d7..6f82dfa 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/SecurityGroupAndOwner.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;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/regionscoped/LoadBalancerInRegion.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/regionscoped/LoadBalancerInRegion.java b/elb/src/main/java/org/jclouds/elb/domain/regionscoped/LoadBalancerInRegion.java
index 8351009..7690bc7 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/regionscoped/LoadBalancerInRegion.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/regionscoped/LoadBalancerInRegion.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jclouds.elb.domain.regionscoped;
 
 import static com.google.common.base.Preconditions.checkNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/domain/regionscoped/RegionAndName.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/domain/regionscoped/RegionAndName.java b/elb/src/main/java/org/jclouds/elb/domain/regionscoped/RegionAndName.java
index eb78fc6..bd24484 100644
--- a/elb/src/main/java/org/jclouds/elb/domain/regionscoped/RegionAndName.java
+++ b/elb/src/main/java/org/jclouds/elb/domain/regionscoped/RegionAndName.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.regionscoped;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/features/AvailabilityZoneApi.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/features/AvailabilityZoneApi.java b/elb/src/main/java/org/jclouds/elb/features/AvailabilityZoneApi.java
index 953815c..bd3d1a1 100644
--- a/elb/src/main/java/org/jclouds/elb/features/AvailabilityZoneApi.java
+++ b/elb/src/main/java/org/jclouds/elb/features/AvailabilityZoneApi.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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/features/InstanceApi.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/features/InstanceApi.java b/elb/src/main/java/org/jclouds/elb/features/InstanceApi.java
index c35fa1c..fc2457c 100644
--- a/elb/src/main/java/org/jclouds/elb/features/InstanceApi.java
+++ b/elb/src/main/java/org/jclouds/elb/features/InstanceApi.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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/features/LoadBalancerApi.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/features/LoadBalancerApi.java b/elb/src/main/java/org/jclouds/elb/features/LoadBalancerApi.java
index 0801869..23cc2e0 100644
--- a/elb/src/main/java/org/jclouds/elb/features/LoadBalancerApi.java
+++ b/elb/src/main/java/org/jclouds/elb/features/LoadBalancerApi.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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/features/PolicyApi.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/features/PolicyApi.java b/elb/src/main/java/org/jclouds/elb/features/PolicyApi.java
index f23b1a2..e9420b0 100644
--- a/elb/src/main/java/org/jclouds/elb/features/PolicyApi.java
+++ b/elb/src/main/java/org/jclouds/elb/features/PolicyApi.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.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/functions/LoadBalancersToPagedIterable.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/functions/LoadBalancersToPagedIterable.java b/elb/src/main/java/org/jclouds/elb/functions/LoadBalancersToPagedIterable.java
index 4293494..6a9feaf 100644
--- a/elb/src/main/java/org/jclouds/elb/functions/LoadBalancersToPagedIterable.java
+++ b/elb/src/main/java/org/jclouds/elb/functions/LoadBalancersToPagedIterable.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.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBBindLoadBalancerStrategiesByClass.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBBindLoadBalancerStrategiesByClass.java b/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBBindLoadBalancerStrategiesByClass.java
index d7d87b9..94c96b7 100644
--- a/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBBindLoadBalancerStrategiesByClass.java
+++ b/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBBindLoadBalancerStrategiesByClass.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.loadbalancer.config;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerContextModule.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerContextModule.java b/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerContextModule.java
index fb4b60d..debf7a8 100644
--- a/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerContextModule.java
+++ b/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerContextModule.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.loadbalancer.config;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerServiceDependenciesModule.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerServiceDependenciesModule.java b/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerServiceDependenciesModule.java
index ea63f0b..6128f27 100644
--- a/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerServiceDependenciesModule.java
+++ b/elb/src/main/java/org/jclouds/elb/loadbalancer/config/ELBLoadBalancerServiceDependenciesModule.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.loadbalancer.config;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java b/elb/src/main/java/org/jclouds/elb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java
index 4ee5f77..e56aa6c 100644
--- a/elb/src/main/java/org/jclouds/elb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java
+++ b/elb/src/main/java/org/jclouds/elb/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.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.loadbalancer.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBDestroyLoadBalancerStrategy.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBDestroyLoadBalancerStrategy.java b/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBDestroyLoadBalancerStrategy.java
index beb63de..812c3f0 100644
--- a/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBDestroyLoadBalancerStrategy.java
+++ b/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBDestroyLoadBalancerStrategy.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.loadbalancer.strategy;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBGetLoadBalancerMetadataStrategy.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBGetLoadBalancerMetadataStrategy.java b/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBGetLoadBalancerMetadataStrategy.java
index b470d13..5f436b4 100644
--- a/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBGetLoadBalancerMetadataStrategy.java
+++ b/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBGetLoadBalancerMetadataStrategy.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.loadbalancer.strategy;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBListLoadBalancersStrategy.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBListLoadBalancersStrategy.java b/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBListLoadBalancersStrategy.java
index 55aac0a..a6dd39a 100644
--- a/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBListLoadBalancersStrategy.java
+++ b/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBListLoadBalancersStrategy.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.loadbalancer.strategy;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBLoadBalanceNodesStrategy.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBLoadBalanceNodesStrategy.java b/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBLoadBalanceNodesStrategy.java
index be5a952..bef692e 100644
--- a/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBLoadBalanceNodesStrategy.java
+++ b/elb/src/main/java/org/jclouds/elb/loadbalancer/strategy/ELBLoadBalanceNodesStrategy.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.loadbalancer.strategy;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java b/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java
index d8cd241..9e548cf 100644
--- a/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.java
+++ b/elb/src/main/java/org/jclouds/elb/options/ListLoadBalancersOptions.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.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java b/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java
index 199bcee..e0b452e 100644
--- a/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.java
+++ b/elb/src/main/java/org/jclouds/elb/options/ListPoliciesOptions.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.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/AttributeMetadataHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/AttributeMetadataHandler.java b/elb/src/main/java/org/jclouds/elb/xml/AttributeMetadataHandler.java
index 7164218..8c7770d 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/AttributeMetadataHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/AttributeMetadataHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/AvailabilityZonesResultHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/AvailabilityZonesResultHandler.java b/elb/src/main/java/org/jclouds/elb/xml/AvailabilityZonesResultHandler.java
index 547ed62..8ef1f12 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/AvailabilityZonesResultHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/AvailabilityZonesResultHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/CreateLoadBalancerResponseHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/CreateLoadBalancerResponseHandler.java b/elb/src/main/java/org/jclouds/elb/xml/CreateLoadBalancerResponseHandler.java
index 48304ca..e03977a 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/CreateLoadBalancerResponseHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/CreateLoadBalancerResponseHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/DescribeInstanceHealthResultHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/DescribeInstanceHealthResultHandler.java b/elb/src/main/java/org/jclouds/elb/xml/DescribeInstanceHealthResultHandler.java
index 5791720..0c654be 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/DescribeInstanceHealthResultHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/DescribeInstanceHealthResultHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPoliciesResultHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPoliciesResultHandler.java b/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPoliciesResultHandler.java
index 1f8b198..adb8881 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPoliciesResultHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPoliciesResultHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPolicyTypesResultHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPolicyTypesResultHandler.java b/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPolicyTypesResultHandler.java
index 9536f67..2f2846f 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPolicyTypesResultHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancerPolicyTypesResultHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancersResultHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancersResultHandler.java b/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancersResultHandler.java
index 5f643d6..6116f26 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancersResultHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/DescribeLoadBalancersResultHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/HealthCheckHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/HealthCheckHandler.java b/elb/src/main/java/org/jclouds/elb/xml/HealthCheckHandler.java
index 7bab62e..a224bb8 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/HealthCheckHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/HealthCheckHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/InstanceStateHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/InstanceStateHandler.java b/elb/src/main/java/org/jclouds/elb/xml/InstanceStateHandler.java
index 4df2752..16fb3c2 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/InstanceStateHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/InstanceStateHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/InstancesResultHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/InstancesResultHandler.java b/elb/src/main/java/org/jclouds/elb/xml/InstancesResultHandler.java
index f2cc87a..d3123bc 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/InstancesResultHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/InstancesResultHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/ListenerWithPoliciesHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/ListenerWithPoliciesHandler.java b/elb/src/main/java/org/jclouds/elb/xml/ListenerWithPoliciesHandler.java
index efe94a1..bc5982c 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/ListenerWithPoliciesHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/ListenerWithPoliciesHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/LoadBalancerHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/LoadBalancerHandler.java b/elb/src/main/java/org/jclouds/elb/xml/LoadBalancerHandler.java
index d4961bf..eb1cc1a 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/LoadBalancerHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/LoadBalancerHandler.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.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/elb/src/main/java/org/jclouds/elb/xml/PolicyHandler.java
----------------------------------------------------------------------
diff --git a/elb/src/main/java/org/jclouds/elb/xml/PolicyHandler.java b/elb/src/main/java/org/jclouds/elb/xml/PolicyHandler.java
index edd1ad2..b836bcd 100644
--- a/elb/src/main/java/org/jclouds/elb/xml/PolicyHandler.java
+++ b/elb/src/main/java/org/jclouds/elb/xml/PolicyHandler.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.xml;

[8/9] git commit: JCLOUDS-63. removed unnecessary headers

Posted by ad...@apache.org.
JCLOUDS-63. removed unnecessary headers


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/622dfebd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/tree/622dfebd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/diff/622dfebd

Branch: refs/heads/master
Commit: 622dfebdf51e51ae068dbf2fed782c4da34128bf
Parents: bcb854d
Author: adriancole <ad...@gmail.com>
Authored: Thu May 16 22:36:21 2013 -0700
Committer: adriancole <ad...@gmail.com>
Committed: Thu May 16 22:56:33 2013 -0700

----------------------------------------------------------------------
 aws-elb/README.txt |   19 -------------------
 elb/README.txt     |   21 +--------------------
 2 files changed, 1 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/622dfebd/aws-elb/README.txt
----------------------------------------------------------------------
diff --git a/aws-elb/README.txt b/aws-elb/README.txt
index 43661f1..74b35f7 100644
--- a/aws-elb/README.txt
+++ b/aws-elb/README.txt
@@ -1,22 +1,3 @@
-====
-    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.
-====
-
 #
 # The jclouds provider for Amazon's Elastic Load Balancing (http://aws.amazon.com/elasticloadbalancing/).
 #

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/622dfebd/elb/README.txt
----------------------------------------------------------------------
diff --git a/elb/README.txt b/elb/README.txt
index 981e590..1c67cde 100644
--- a/elb/README.txt
+++ b/elb/README.txt
@@ -1,25 +1,6 @@
-====
-    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.
-====
-
 #
 # The jclouds API for Amazon's Elastic Load Balancing service (http://aws.amazon.com/elasticloadbalancing/).
 #
 # TODO: Implementation status.
 # TODO: Supported features.
-# TODO: Usage example.
\ No newline at end of file
+# TODO: Usage example.

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

Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java b/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java
index 8eabd92..ebee0a3 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/EC2SecurityGroup.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.rds.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/IPRange.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/IPRange.java b/rds/src/main/java/org/jclouds/rds/domain/IPRange.java
index 83146d7..f9a4736 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/IPRange.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/IPRange.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.rds.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/Instance.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/Instance.java b/rds/src/main/java/org/jclouds/rds/domain/Instance.java
index 5a5a4b2..c3b839c 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/Instance.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/Instance.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.rds.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java b/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java
index bdab38d..635a646 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.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.rds.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java b/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java
index 071916a..de3263f 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/SecurityGroup.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.rds.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/Subnet.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/Subnet.java b/rds/src/main/java/org/jclouds/rds/domain/Subnet.java
index 105f910..f3c8d91 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/Subnet.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/Subnet.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.rds.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java b/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java
index b960961..45c440a 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/SubnetGroup.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.rds.domain;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java b/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java
index ae044d1..d8ed91a 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/internal/BaseInstance.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.rds.domain.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/features/InstanceApi.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/features/InstanceApi.java b/rds/src/main/java/org/jclouds/rds/features/InstanceApi.java
index 26f77d2..bf381df 100644
--- a/rds/src/main/java/org/jclouds/rds/features/InstanceApi.java
+++ b/rds/src/main/java/org/jclouds/rds/features/InstanceApi.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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/features/SecurityGroupApi.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/features/SecurityGroupApi.java b/rds/src/main/java/org/jclouds/rds/features/SecurityGroupApi.java
index 2656a25..c4f4e4e 100644
--- a/rds/src/main/java/org/jclouds/rds/features/SecurityGroupApi.java
+++ b/rds/src/main/java/org/jclouds/rds/features/SecurityGroupApi.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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/features/SubnetGroupApi.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/features/SubnetGroupApi.java b/rds/src/main/java/org/jclouds/rds/features/SubnetGroupApi.java
index ed8c1ca..361a20d 100644
--- a/rds/src/main/java/org/jclouds/rds/features/SubnetGroupApi.java
+++ b/rds/src/main/java/org/jclouds/rds/features/SubnetGroupApi.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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/functions/InstancesToPagedIterable.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/functions/InstancesToPagedIterable.java b/rds/src/main/java/org/jclouds/rds/functions/InstancesToPagedIterable.java
index 9f60fab..f3b51e8 100644
--- a/rds/src/main/java/org/jclouds/rds/functions/InstancesToPagedIterable.java
+++ b/rds/src/main/java/org/jclouds/rds/functions/InstancesToPagedIterable.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.rds.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/functions/SecurityGroupsToPagedIterable.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/functions/SecurityGroupsToPagedIterable.java b/rds/src/main/java/org/jclouds/rds/functions/SecurityGroupsToPagedIterable.java
index 18e6f28..6c47db9 100644
--- a/rds/src/main/java/org/jclouds/rds/functions/SecurityGroupsToPagedIterable.java
+++ b/rds/src/main/java/org/jclouds/rds/functions/SecurityGroupsToPagedIterable.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.rds.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/functions/SubnetGroupsToPagedIterable.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/functions/SubnetGroupsToPagedIterable.java b/rds/src/main/java/org/jclouds/rds/functions/SubnetGroupsToPagedIterable.java
index 2036656..aeb0dd0 100644
--- a/rds/src/main/java/org/jclouds/rds/functions/SubnetGroupsToPagedIterable.java
+++ b/rds/src/main/java/org/jclouds/rds/functions/SubnetGroupsToPagedIterable.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.rds.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java b/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java
index 339cbc5..07934f3 100644
--- a/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.java
+++ b/rds/src/main/java/org/jclouds/rds/options/ListInstancesOptions.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.rds.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java b/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java
index a133560..33be560 100644
--- a/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.java
+++ b/rds/src/main/java/org/jclouds/rds/options/ListSecurityGroupsOptions.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.rds.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java b/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java
index 3875bdc..db4c763 100644
--- a/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.java
+++ b/rds/src/main/java/org/jclouds/rds/options/ListSubnetGroupsOptions.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.rds.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/DescribeDBInstancesResultHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/DescribeDBInstancesResultHandler.java b/rds/src/main/java/org/jclouds/rds/xml/DescribeDBInstancesResultHandler.java
index 4888fb2..7947946 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/DescribeDBInstancesResultHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/DescribeDBInstancesResultHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSecurityGroupsResultHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSecurityGroupsResultHandler.java b/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSecurityGroupsResultHandler.java
index 62f8d8a..381ba48 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSecurityGroupsResultHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSecurityGroupsResultHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSubnetGroupsResultHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSubnetGroupsResultHandler.java b/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSubnetGroupsResultHandler.java
index ac454db..5dd64da 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSubnetGroupsResultHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/DescribeDBSubnetGroupsResultHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/EC2SecurityGroupHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/EC2SecurityGroupHandler.java b/rds/src/main/java/org/jclouds/rds/xml/EC2SecurityGroupHandler.java
index faca7fb..b366341 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/EC2SecurityGroupHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/EC2SecurityGroupHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/IPRangeHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/IPRangeHandler.java b/rds/src/main/java/org/jclouds/rds/xml/IPRangeHandler.java
index 3888c73..c01d719 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/IPRangeHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/IPRangeHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/InstanceHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/InstanceHandler.java b/rds/src/main/java/org/jclouds/rds/xml/InstanceHandler.java
index 8acd84b..fb79c94 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/InstanceHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/InstanceHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/SecurityGroupHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/SecurityGroupHandler.java b/rds/src/main/java/org/jclouds/rds/xml/SecurityGroupHandler.java
index 46e23e7..ab598a9 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/SecurityGroupHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/SecurityGroupHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/SubnetGroupHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/SubnetGroupHandler.java b/rds/src/main/java/org/jclouds/rds/xml/SubnetGroupHandler.java
index 87e29b3..4d6ecc3 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/SubnetGroupHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/SubnetGroupHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/xml/SubnetHandler.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/xml/SubnetHandler.java b/rds/src/main/java/org/jclouds/rds/xml/SubnetHandler.java
index 2846fde..d1e89eb 100644
--- a/rds/src/main/java/org/jclouds/rds/xml/SubnetHandler.java
+++ b/rds/src/main/java/org/jclouds/rds/xml/SubnetHandler.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.rds.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/RDSApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/RDSApiMetadataTest.java b/rds/src/test/java/org/jclouds/rds/RDSApiMetadataTest.java
index 66fbf4b..00f4ac8 100644
--- a/rds/src/test/java/org/jclouds/rds/RDSApiMetadataTest.java
+++ b/rds/src/test/java/org/jclouds/rds/RDSApiMetadataTest.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.rds;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/features/InstanceApiExpectTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/features/InstanceApiExpectTest.java b/rds/src/test/java/org/jclouds/rds/features/InstanceApiExpectTest.java
index 4642a6c..505b459 100644
--- a/rds/src/test/java/org/jclouds/rds/features/InstanceApiExpectTest.java
+++ b/rds/src/test/java/org/jclouds/rds/features/InstanceApiExpectTest.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
  *
- * Unles 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
- * 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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/features/InstanceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/features/InstanceApiLiveTest.java b/rds/src/test/java/org/jclouds/rds/features/InstanceApiLiveTest.java
index 660eb93..ff73a19 100644
--- a/rds/src/test/java/org/jclouds/rds/features/InstanceApiLiveTest.java
+++ b/rds/src/test/java/org/jclouds/rds/features/InstanceApiLiveTest.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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiExpectTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiExpectTest.java b/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiExpectTest.java
index 1e4d4c2..f7b159e 100644
--- a/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiExpectTest.java
+++ b/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiExpectTest.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
  *
- * Unles 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
- * 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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiLiveTest.java b/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiLiveTest.java
index 954c082..f678960 100644
--- a/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiLiveTest.java
+++ b/rds/src/test/java/org/jclouds/rds/features/SecurityGroupApiLiveTest.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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiExpectTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiExpectTest.java b/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiExpectTest.java
index b4d7b43..5acc465 100644
--- a/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiExpectTest.java
+++ b/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiExpectTest.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
  *
- * Unles 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
- * 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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiLiveTest.java b/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiLiveTest.java
index 0c07e41..9e4b1c6 100644
--- a/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiLiveTest.java
+++ b/rds/src/test/java/org/jclouds/rds/features/SubnetGroupApiLiveTest.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.rds.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiExpectTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiExpectTest.java b/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiExpectTest.java
index 0da6043..7bc8de7 100644
--- a/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiExpectTest.java
+++ b/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiExpectTest.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.rds.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiLiveTest.java b/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiLiveTest.java
index 1b7b2b2..08b95bf 100644
--- a/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiLiveTest.java
+++ b/rds/src/test/java/org/jclouds/rds/internal/BaseRDSApiLiveTest.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.rds.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/internal/BaseRDSExpectTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/internal/BaseRDSExpectTest.java b/rds/src/test/java/org/jclouds/rds/internal/BaseRDSExpectTest.java
index 65f1876..c8dd34c 100644
--- a/rds/src/test/java/org/jclouds/rds/internal/BaseRDSExpectTest.java
+++ b/rds/src/test/java/org/jclouds/rds/internal/BaseRDSExpectTest.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.rds.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/options/ListInstancesOptionsTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/options/ListInstancesOptionsTest.java b/rds/src/test/java/org/jclouds/rds/options/ListInstancesOptionsTest.java
index 04820bf..6fe9b46 100644
--- a/rds/src/test/java/org/jclouds/rds/options/ListInstancesOptionsTest.java
+++ b/rds/src/test/java/org/jclouds/rds/options/ListInstancesOptionsTest.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.rds.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/options/ListSecurityGroupsOptionsTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/options/ListSecurityGroupsOptionsTest.java b/rds/src/test/java/org/jclouds/rds/options/ListSecurityGroupsOptionsTest.java
index c949faf..1f88a3a 100644
--- a/rds/src/test/java/org/jclouds/rds/options/ListSecurityGroupsOptionsTest.java
+++ b/rds/src/test/java/org/jclouds/rds/options/ListSecurityGroupsOptionsTest.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.rds.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/options/ListSubnetGroupsOptionsTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/options/ListSubnetGroupsOptionsTest.java b/rds/src/test/java/org/jclouds/rds/options/ListSubnetGroupsOptionsTest.java
index 82041be..af5e171 100644
--- a/rds/src/test/java/org/jclouds/rds/options/ListSubnetGroupsOptionsTest.java
+++ b/rds/src/test/java/org/jclouds/rds/options/ListSubnetGroupsOptionsTest.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.rds.options;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/test/java/org/jclouds/rds/parse/DescribeDBInstancesResponseTest.java
----------------------------------------------------------------------
diff --git a/rds/src/test/java/org/jclouds/rds/parse/DescribeDBInstancesResponseTest.java b/rds/src/test/java/org/jclouds/rds/parse/DescribeDBInstancesResponseTest.java
index 8be9798..b6793fb 100644
--- a/rds/src/test/java/org/jclouds/rds/parse/DescribeDBInstancesResponseTest.java
+++ b/rds/src/test/java/org/jclouds/rds/parse/DescribeDBInstancesResponseTest.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.rds.parse;

[7/9] git commit: JCLOUDS-63. adjust license plugin and header file to ASF license scheme; change java to comment style; include maven pom.xml

Posted by ad...@apache.org.
JCLOUDS-63. adjust license plugin and header file to ASF license scheme; change java to comment style; include maven pom.xml


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/bcb854d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/tree/bcb854d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/diff/bcb854d4

Branch: refs/heads/master
Commit: bcb854d48ba752f0079d2f51d463d65a975aaf21
Parents: 2c86b8e
Author: adriancole <ad...@gmail.com>
Authored: Thu May 16 22:23:44 2013 -0700
Committer: adriancole <ad...@gmail.com>
Committed: Thu May 16 22:56:33 2013 -0700

----------------------------------------------------------------------
 pom.xml            |  145 ++++++++++++++++++++++++++++++++++-------------
 src/etc/header.txt |   14 +++++
 2 files changed, 120 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/bcb854d4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c0ae46d..d564c60 100644
--- a/pom.xml
+++ b/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
-
-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.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 -->
 <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">
@@ -80,7 +78,6 @@ under the License.
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <version>0.8</version>
         <inherited>false</inherited>
         <executions>
           <execution>
@@ -91,26 +88,55 @@ under the License.
           </execution>
         </executions>
         <configuration>
+          <excludeSubProjects>false</excludeSubProjects>
           <excludes>
+            <!-- expectation files for unit tests -->
+            <exclude>**/src/test/resources/**</exclude>
+
+            <!-- prevent duplicating license -->
+            <exclude>**/LICENSE.txt</exclude>
+            <exclude>**/header.txt</exclude>
+
+            <!-- high-level project metadata -->
+            <exclude>**/NOTICE.txt</exclude>
+            <exclude>**/DISCLAIMER</exclude>
             <exclude>**/BUILD.txt</exclude>
             <exclude>**/CHANGES.txt</exclude>
-            <exclude>**/NOTICE-src.txt</exclude>
             <exclude>**/README.md</exclude>
+            <exclude>**/README.txt</exclude>
+
+            <!-- reference data lists -->
+            <exclude>**/*json</exclude>
+            <exclude>**/*readme</exclude>
+
+            <!-- one-line service registry files -->
+            <exclude>**/*ProviderMetadata</exclude>
+            <exclude>**/*ApiMetadata</exclude>
+            <exclude>**/*LoggingModule</exclude>
+            <exclude>**/*ViewMBeanFactory</exclude>
+
+            <!-- temporary files or those generated by IDE or SCM -->
+            <exclude>**/target/**</exclude>
+            <exclude>**/test-output/**</exclude>
+            <exclude>**/bin/**</exclude>
+            <exclude>**/.settings/**</exclude>
+            <exclude>**/.classpath</exclude>
+            <exclude>**/.dir-locals.el</exclude>
+            <exclude>**/.project</exclude>
+            <exclude>**/.idea/**</exclude>
+            <exclude>**/*.iml</exclude>
+            <exclude>**/*.eml</exclude>
+            <exclude>**/*.ipr</exclude>
+            <exclude>**/*.iws</exclude>
+            <exclude>**/*.DS_STORE</exclude>
+            <exclude>**/TAGS</exclude>
+            <exclude>**/.metadata/**</exclude>
+            <exclude>**/atlassian-ide-plugin.xml</exclude>
+            <exclude>**/.DS_Store</exclude>
+            <exclude>.mailmap</exclude>
             <exclude>.git/**</exclude>
             <exclude>**/.gitignore</exclude>
-            <exclude>**/*.json</exclude>
-            <exclude>**/*.log*</exclude>
-            <exclude>**/TODO</exclude>
-            <exclude>.mailmap</exclude>
-            <exclude>.idea/**</exclude>
-            <exclude>**/*.iml</exclude>
-            <exclude>**/.project</exclude>
-            <exclude>**/.classpath</exclude>
-            <exclude>**/.settings/**</exclude>
-            <exclude>**/.checkstyle</exclude>
-            <exclude>**/target/**</exclude>
-            <exclude>.repository/**</exclude>
-            <!-- binary -->
+            <exclude>**/.gitattributes</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -122,22 +148,63 @@ under the License.
           <strictCheck>true</strictCheck>
           <encoding>${sourceEncoding}</encoding>
           <aggregate>true</aggregate>
-          <header>project/src/etc/header.txt</header>
+          <header>src/etc/header.txt</header>
           <mapping>
-            <clj>SEMICOLON_STYLE</clj>
+                <xml>XML_STYLE</xml>
+                <java>SLASHSTAR_STYLE</java>
+                <clj>SEMICOLON_STYLE</clj>
+                <index>SCRIPT_STYLE</index>
           </mapping>
           <excludes>
-            <exclude>**/src/**/resources/**</exclude>
+            <!-- expectation files for unit tests -->
+            <exclude>**/src/test/resources/**</exclude>
+
+            <!-- prevent duplicating license -->
             <exclude>**/LICENSE.txt</exclude>
+            <exclude>**/header.txt</exclude>
+
+            <!-- high-level project metadata -->
             <exclude>**/NOTICE.txt</exclude>
+            <exclude>**/DISCLAIMER</exclude>
+            <exclude>**/BUILD.txt</exclude>
+            <exclude>**/CHANGES.txt</exclude>
             <exclude>**/README.md</exclude>
             <exclude>**/README.txt</exclude>
-            <exclude>**/header.txt</exclude>
+
+            <!-- reference data lists -->
+            <exclude>**/*json</exclude>
+            <exclude>**/*readme</exclude>
+
+            <!-- one-line service registry files -->
+            <exclude>**/*ProviderMetadata</exclude>
+            <exclude>**/*ApiMetadata</exclude>
+            <exclude>**/*LoggingModule</exclude>
+            <exclude>**/*ViewMBeanFactory</exclude>
+
+            <!-- temporary files or those generated by IDE or SCM -->
+            <exclude>**/target/**</exclude>
+            <exclude>**/test-output/**</exclude>
+            <exclude>**/bin/**</exclude>
+            <exclude>**/.settings/**</exclude>
+            <exclude>**/.classpath</exclude>
+            <exclude>**/.dir-locals.el</exclude>
+            <exclude>**/.project</exclude>
+            <exclude>**/.idea/**</exclude>
+            <exclude>**/*.iml</exclude>
+            <exclude>**/*.eml</exclude>
+            <exclude>**/*.ipr</exclude>
+            <exclude>**/*.iws</exclude>
+            <exclude>**/*.DS_STORE</exclude>
+            <exclude>**/TAGS</exclude>
+            <exclude>**/.metadata/**</exclude>
+            <exclude>**/atlassian-ide-plugin.xml</exclude>
+            <exclude>**/.DS_Store</exclude>
+            <exclude>.mailmap</exclude>
+            <exclude>.git/**</exclude>
+            <exclude>**/.gitignore</exclude>
+            <exclude>**/.gitattributes</exclude>
           </excludes>
-          <properties>
-            <year>2011</year>
-            <copyrightHolder>jclouds, Inc.</copyrightHolder>
-          </properties>
+          <useDefaultExcludes>false</useDefaultExcludes>
         </configuration>
       </plugin>
     </plugins>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/bcb854d4/src/etc/header.txt
----------------------------------------------------------------------
diff --git a/src/etc/header.txt b/src/etc/header.txt
new file mode 100644
index 0000000..1745cfe
--- /dev/null
+++ b/src/etc/header.txt
@@ -0,0 +1,14 @@
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

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

Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesToPagedIterable.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesToPagedIterable.java b/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesToPagedIterable.java
index 77bf6b1..d59e390 100644
--- a/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesToPagedIterable.java
+++ b/iam/src/main/java/org/jclouds/iam/functions/InstanceProfilesToPagedIterable.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.iam.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/functions/PoliciesToPagedIterable.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/functions/PoliciesToPagedIterable.java b/iam/src/main/java/org/jclouds/iam/functions/PoliciesToPagedIterable.java
index a2c442d..e11d177 100644
--- a/iam/src/main/java/org/jclouds/iam/functions/PoliciesToPagedIterable.java
+++ b/iam/src/main/java/org/jclouds/iam/functions/PoliciesToPagedIterable.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.iam.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/functions/RolesToPagedIterable.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/functions/RolesToPagedIterable.java b/iam/src/main/java/org/jclouds/iam/functions/RolesToPagedIterable.java
index afe2600..809d8fa 100644
--- a/iam/src/main/java/org/jclouds/iam/functions/RolesToPagedIterable.java
+++ b/iam/src/main/java/org/jclouds/iam/functions/RolesToPagedIterable.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.iam.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/functions/UsersToPagedIterable.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/functions/UsersToPagedIterable.java b/iam/src/main/java/org/jclouds/iam/functions/UsersToPagedIterable.java
index 085f900..d435649 100644
--- a/iam/src/main/java/org/jclouds/iam/functions/UsersToPagedIterable.java
+++ b/iam/src/main/java/org/jclouds/iam/functions/UsersToPagedIterable.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.iam.functions;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/xml/InstanceProfileHandler.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/xml/InstanceProfileHandler.java b/iam/src/main/java/org/jclouds/iam/xml/InstanceProfileHandler.java
index f90b594..eb2deec 100644
--- a/iam/src/main/java/org/jclouds/iam/xml/InstanceProfileHandler.java
+++ b/iam/src/main/java/org/jclouds/iam/xml/InstanceProfileHandler.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.iam.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/xml/ListInstanceProfilesResultHandler.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/xml/ListInstanceProfilesResultHandler.java b/iam/src/main/java/org/jclouds/iam/xml/ListInstanceProfilesResultHandler.java
index ccc3e10..4b795c6 100644
--- a/iam/src/main/java/org/jclouds/iam/xml/ListInstanceProfilesResultHandler.java
+++ b/iam/src/main/java/org/jclouds/iam/xml/ListInstanceProfilesResultHandler.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.iam.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/xml/ListPoliciesResultHandler.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/xml/ListPoliciesResultHandler.java b/iam/src/main/java/org/jclouds/iam/xml/ListPoliciesResultHandler.java
index 3bb5084..8f969f1 100644
--- a/iam/src/main/java/org/jclouds/iam/xml/ListPoliciesResultHandler.java
+++ b/iam/src/main/java/org/jclouds/iam/xml/ListPoliciesResultHandler.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.iam.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/xml/ListRolesResultHandler.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/xml/ListRolesResultHandler.java b/iam/src/main/java/org/jclouds/iam/xml/ListRolesResultHandler.java
index 022b9ad..4da925d 100644
--- a/iam/src/main/java/org/jclouds/iam/xml/ListRolesResultHandler.java
+++ b/iam/src/main/java/org/jclouds/iam/xml/ListRolesResultHandler.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.iam.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/xml/ListUsersResultHandler.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/xml/ListUsersResultHandler.java b/iam/src/main/java/org/jclouds/iam/xml/ListUsersResultHandler.java
index 980d24b..8b9aeeb 100644
--- a/iam/src/main/java/org/jclouds/iam/xml/ListUsersResultHandler.java
+++ b/iam/src/main/java/org/jclouds/iam/xml/ListUsersResultHandler.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.iam.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/xml/PolicyHandler.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/xml/PolicyHandler.java b/iam/src/main/java/org/jclouds/iam/xml/PolicyHandler.java
index c386754..959f3dc 100644
--- a/iam/src/main/java/org/jclouds/iam/xml/PolicyHandler.java
+++ b/iam/src/main/java/org/jclouds/iam/xml/PolicyHandler.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.iam.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/xml/RoleHandler.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/xml/RoleHandler.java b/iam/src/main/java/org/jclouds/iam/xml/RoleHandler.java
index 0c3357b..4b1fa19 100644
--- a/iam/src/main/java/org/jclouds/iam/xml/RoleHandler.java
+++ b/iam/src/main/java/org/jclouds/iam/xml/RoleHandler.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.iam.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/main/java/org/jclouds/iam/xml/UserHandler.java
----------------------------------------------------------------------
diff --git a/iam/src/main/java/org/jclouds/iam/xml/UserHandler.java b/iam/src/main/java/org/jclouds/iam/xml/UserHandler.java
index 0c155a3..7b71e89 100644
--- a/iam/src/main/java/org/jclouds/iam/xml/UserHandler.java
+++ b/iam/src/main/java/org/jclouds/iam/xml/UserHandler.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.iam.xml;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/IAMApiLiveTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/IAMApiLiveTest.java b/iam/src/test/java/org/jclouds/iam/IAMApiLiveTest.java
index ae403df..c0c8fb0 100644
--- a/iam/src/test/java/org/jclouds/iam/IAMApiLiveTest.java
+++ b/iam/src/test/java/org/jclouds/iam/IAMApiLiveTest.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.iam;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/IAMApiMetadataTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/IAMApiMetadataTest.java b/iam/src/test/java/org/jclouds/iam/IAMApiMetadataTest.java
index 5617334..fc4ad2c 100644
--- a/iam/src/test/java/org/jclouds/iam/IAMApiMetadataTest.java
+++ b/iam/src/test/java/org/jclouds/iam/IAMApiMetadataTest.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.iam;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiExpectTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiExpectTest.java b/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiExpectTest.java
index 18a7a4e..a1e85a4 100644
--- a/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiExpectTest.java
+++ b/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiExpectTest.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
  *
- * Unles 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
- * 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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiLiveTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiLiveTest.java b/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiLiveTest.java
index ffdfb88..ef528a6 100644
--- a/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiLiveTest.java
+++ b/iam/src/test/java/org/jclouds/iam/features/InstanceProfileApiLiveTest.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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/features/RoleApiExpectTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/features/RoleApiExpectTest.java b/iam/src/test/java/org/jclouds/iam/features/RoleApiExpectTest.java
index 67c9476..c55f876 100644
--- a/iam/src/test/java/org/jclouds/iam/features/RoleApiExpectTest.java
+++ b/iam/src/test/java/org/jclouds/iam/features/RoleApiExpectTest.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
  *
- * Unles 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
- * 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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/features/RoleApiLiveTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/features/RoleApiLiveTest.java b/iam/src/test/java/org/jclouds/iam/features/RoleApiLiveTest.java
index b2f0ce1..a5b231b 100644
--- a/iam/src/test/java/org/jclouds/iam/features/RoleApiLiveTest.java
+++ b/iam/src/test/java/org/jclouds/iam/features/RoleApiLiveTest.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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiExpectTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiExpectTest.java b/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiExpectTest.java
index 1c203f8..e391ab6 100644
--- a/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiExpectTest.java
+++ b/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiExpectTest.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
  *
- * Unles 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
- * 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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiLiveTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiLiveTest.java b/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiLiveTest.java
index c7f03f1..93426da 100644
--- a/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiLiveTest.java
+++ b/iam/src/test/java/org/jclouds/iam/features/RolePolicyApiLiveTest.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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/features/UserApiExpectTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/features/UserApiExpectTest.java b/iam/src/test/java/org/jclouds/iam/features/UserApiExpectTest.java
index 08b8fb0..b83a99d 100644
--- a/iam/src/test/java/org/jclouds/iam/features/UserApiExpectTest.java
+++ b/iam/src/test/java/org/jclouds/iam/features/UserApiExpectTest.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
  *
- * Unles 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
- * 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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/features/UserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/features/UserApiLiveTest.java b/iam/src/test/java/org/jclouds/iam/features/UserApiLiveTest.java
index d0515ef..cb72590 100644
--- a/iam/src/test/java/org/jclouds/iam/features/UserApiLiveTest.java
+++ b/iam/src/test/java/org/jclouds/iam/features/UserApiLiveTest.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.iam.features;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiExpectTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiExpectTest.java b/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiExpectTest.java
index 8be851b..b447dda 100644
--- a/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiExpectTest.java
+++ b/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiExpectTest.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.iam.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiLiveTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiLiveTest.java b/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiLiveTest.java
index 96b07a7..e890f3e 100644
--- a/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiLiveTest.java
+++ b/iam/src/test/java/org/jclouds/iam/internal/BaseIAMApiLiveTest.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.iam.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/internal/BaseIAMExpectTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/internal/BaseIAMExpectTest.java b/iam/src/test/java/org/jclouds/iam/internal/BaseIAMExpectTest.java
index 34a1b75..26f1575 100644
--- a/iam/src/test/java/org/jclouds/iam/internal/BaseIAMExpectTest.java
+++ b/iam/src/test/java/org/jclouds/iam/internal/BaseIAMExpectTest.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.iam.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/parse/GetInstanceProfileResponseTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/parse/GetInstanceProfileResponseTest.java b/iam/src/test/java/org/jclouds/iam/parse/GetInstanceProfileResponseTest.java
index 6d76371..9fbacab 100644
--- a/iam/src/test/java/org/jclouds/iam/parse/GetInstanceProfileResponseTest.java
+++ b/iam/src/test/java/org/jclouds/iam/parse/GetInstanceProfileResponseTest.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.iam.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/parse/GetRolePolicyResponseTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/parse/GetRolePolicyResponseTest.java b/iam/src/test/java/org/jclouds/iam/parse/GetRolePolicyResponseTest.java
index 0303637..9e8f8e8 100644
--- a/iam/src/test/java/org/jclouds/iam/parse/GetRolePolicyResponseTest.java
+++ b/iam/src/test/java/org/jclouds/iam/parse/GetRolePolicyResponseTest.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.iam.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/parse/GetRoleResponseTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/parse/GetRoleResponseTest.java b/iam/src/test/java/org/jclouds/iam/parse/GetRoleResponseTest.java
index 16bcfc4..27ce383 100644
--- a/iam/src/test/java/org/jclouds/iam/parse/GetRoleResponseTest.java
+++ b/iam/src/test/java/org/jclouds/iam/parse/GetRoleResponseTest.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.iam.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/parse/GetUserResponseTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/parse/GetUserResponseTest.java b/iam/src/test/java/org/jclouds/iam/parse/GetUserResponseTest.java
index d274cb9..3d90a7a 100644
--- a/iam/src/test/java/org/jclouds/iam/parse/GetUserResponseTest.java
+++ b/iam/src/test/java/org/jclouds/iam/parse/GetUserResponseTest.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.iam.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/parse/ListInstanceProfilesResponseTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/parse/ListInstanceProfilesResponseTest.java b/iam/src/test/java/org/jclouds/iam/parse/ListInstanceProfilesResponseTest.java
index e33962b..3520914 100644
--- a/iam/src/test/java/org/jclouds/iam/parse/ListInstanceProfilesResponseTest.java
+++ b/iam/src/test/java/org/jclouds/iam/parse/ListInstanceProfilesResponseTest.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.iam.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/parse/ListRolePoliciesResponseTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/parse/ListRolePoliciesResponseTest.java b/iam/src/test/java/org/jclouds/iam/parse/ListRolePoliciesResponseTest.java
index b486760..f8b18f1 100644
--- a/iam/src/test/java/org/jclouds/iam/parse/ListRolePoliciesResponseTest.java
+++ b/iam/src/test/java/org/jclouds/iam/parse/ListRolePoliciesResponseTest.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.iam.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/parse/ListRolesResponseTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/parse/ListRolesResponseTest.java b/iam/src/test/java/org/jclouds/iam/parse/ListRolesResponseTest.java
index 9e57fe4..d830b4d 100644
--- a/iam/src/test/java/org/jclouds/iam/parse/ListRolesResponseTest.java
+++ b/iam/src/test/java/org/jclouds/iam/parse/ListRolesResponseTest.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.iam.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/iam/src/test/java/org/jclouds/iam/parse/ListUsersResponseTest.java
----------------------------------------------------------------------
diff --git a/iam/src/test/java/org/jclouds/iam/parse/ListUsersResponseTest.java b/iam/src/test/java/org/jclouds/iam/parse/ListUsersResponseTest.java
index 539de6f..d97cc8e 100644
--- a/iam/src/test/java/org/jclouds/iam/parse/ListUsersResponseTest.java
+++ b/iam/src/test/java/org/jclouds/iam/parse/ListUsersResponseTest.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.iam.parse;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/pom.xml
----------------------------------------------------------------------
diff --git a/rds/pom.xml b/rds/pom.xml
index 699abad..97ff4cf 100644
--- a/rds/pom.xml
+++ b/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/rds/src/main/java/org/jclouds/rds/RDSApi.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/RDSApi.java b/rds/src/main/java/org/jclouds/rds/RDSApi.java
index a38befa..4c060ac 100644
--- a/rds/src/main/java/org/jclouds/rds/RDSApi.java
+++ b/rds/src/main/java/org/jclouds/rds/RDSApi.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.rds;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.java b/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.java
index 211fb5a..4552cc7 100644
--- a/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.java
+++ b/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.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.rds;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java b/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java
index a484282..39c497e 100644
--- a/rds/src/main/java/org/jclouds/rds/RDSFallbacks.java
+++ b/rds/src/main/java/org/jclouds/rds/RDSFallbacks.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
  *
- * 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.rds;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/binders/BindInstanceRequestToFormParams.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/binders/BindInstanceRequestToFormParams.java b/rds/src/main/java/org/jclouds/rds/binders/BindInstanceRequestToFormParams.java
index 1f11b9e..f35cc23 100644
--- a/rds/src/main/java/org/jclouds/rds/binders/BindInstanceRequestToFormParams.java
+++ b/rds/src/main/java/org/jclouds/rds/binders/BindInstanceRequestToFormParams.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.rds.binders;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/config/RDSHttpApiModule.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/config/RDSHttpApiModule.java b/rds/src/main/java/org/jclouds/rds/config/RDSHttpApiModule.java
index 5ffeb7a..da5994b 100644
--- a/rds/src/main/java/org/jclouds/rds/config/RDSHttpApiModule.java
+++ b/rds/src/main/java/org/jclouds/rds/config/RDSHttpApiModule.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.rds.config;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/03c628bd/rds/src/main/java/org/jclouds/rds/domain/Authorization.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/Authorization.java b/rds/src/main/java/org/jclouds/rds/domain/Authorization.java
index b4becbe..4f2f167 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/Authorization.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/Authorization.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.rds.domain;

[9/9] git commit: JCLOUDS-63. remove copyright notice from README

Posted by ad...@apache.org.
JCLOUDS-63. remove copyright notice from README


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/2c86b8e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/tree/2c86b8e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/diff/2c86b8e7

Branch: refs/heads/master
Commit: 2c86b8e7901714a5c408f83df2618b530fa94081
Parents: 5655b6f
Author: adriancole <ad...@gmail.com>
Authored: Thu May 16 22:20:21 2013 -0700
Committer: adriancole <ad...@gmail.com>
Committed: Thu May 16 22:56:33 2013 -0700

----------------------------------------------------------------------
 README.md |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-aws/blob/2c86b8e7/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 50dfa67..523b384 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,5 @@ Repository for developing AWS providers and APIs
 
 License
 -------
-Copyright (C) 2009-2013 jclouds, Inc.
 
 Licensed under the Apache License, Version 2.0