JCLOUDS-64: Update license headers

providers/google-compute-engine/pom.xml

@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
-~ Licensed to jclouds, Inc. (jclouds) under one or more
+
-~ contributor license agreements.  See the NOTICE file
+    Licensed to the Apache Software Foundation (ASF) under one or more
-~ distributed with this work for additional information
+    contributor license agreements.  See the NOTICE file distributed with
-~ regarding copyright ownership.  jclouds licenses this file
+    this work for additional information regarding copyright ownership.
-~ to you under the Apache License, Version 2.0 (the
+    The ASF licenses this file to You under the Apache License, Version 2.0
-~ "License"); you may not use this file except in compliance
+    (the "License"); you may not use this file except in compliance with
-~ with the License.  You may obtain a copy of the License at
+    the License.  You may obtain a copy of the License at
-~
+
-~   http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
-~
+
-~ Unless required by applicable law or agreed to in writing,
+    Unless required by applicable law or agreed to in writing, software
-~ software distributed under the License is distributed on an
+    distributed under the License is distributed on an "AS IS" BASIS,
-~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~ KIND, either express or implied.  See the License for the
+    See the License for the specific language governing permissions and
-~ specific language governing permissions and limitations
+    limitations under the License.
-~ 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">
   <modelVersion>4.0.0</modelVersion>

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApi.java

@@ -1,20 +1,18 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine;
 

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadata.java

@@ -1,20 +1,18 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine;
 

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/GoogleComputeEngineConstants.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineService.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/config/GoogleComputeEngineServiceContextModule.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.config;
 
 import com.google.common.annotations.VisibleForTesting;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/BuildInstanceMetadata.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.functions;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/GoogleComputeEngineImageToImage.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.functions;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.functions;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.functions;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/OrphanedGroupsFromDeadNodes.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.functions;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/ZoneToLocation.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.functions;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/options/GoogleComputeEngineTemplateOptions.java

@@ -1,22 +1,19 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.options;
 
 import com.google.common.base.Optional;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/predicates/AllNodesInGroupTerminated.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.predicates;
 
 import com.google.common.base.Predicate;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.strategy;
 
 import com.google.common.base.Predicate;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/PopulateDefaultLoginCredentialsForImageStrategy.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.strategy;
 
 import com.google.inject.Inject;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/UseNodeCredentialsButOverrideFromTemplate.java

@@ -1,22 +1,19 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.strategy;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineHttpApiModule.java

@@ -1,20 +1,18 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine.config;
 

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/GoogleComputeEngineParserModule.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.config;
 
 import com.google.common.collect.ForwardingMap;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/OAuthModuleWithoutTypeAdapters.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.config;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/config/UserProject.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.config;
 
 import javax.inject.Qualifier;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.base.Objects;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Kernel.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.base.Objects;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.domain;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/DiskApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/FirewallApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ImageApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/InstanceApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/KernelApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/MachineTypeApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/NetworkApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/OperationApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ProjectApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/features/ZoneApi.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.jclouds.googlecomputeengine.GoogleComputeEngineConstants.COMPUTE_READONLY_SCOPE;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/BaseToPagedIterable.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.annotations.Beta;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/PATCH.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import javax.ws.rs.HttpMethod;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseDisks.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseFirewalls.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseImages.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseInstances.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseKernels.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseMachineTypes.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseNetworks.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseOperations.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/functions/internal/ParseZones.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.functions.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/FirewallBinder.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.handlers;
 
 import org.jclouds.googlecomputeengine.options.FirewallOptions;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/GoogleComputeEngineErrorHandler.java

@@ -1,20 +1,18 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine.handlers;
 

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/InstanceBinder.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.handlers;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/handlers/MetadataBinder.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.handlers;
 
 import org.jclouds.googlecomputeengine.config.GoogleComputeEngineParserModule;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/FirewallOptions.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.options;
 
 import com.google.common.collect.ImmutableSet;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/options/ListOptions.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.options;
 
 import org.jclouds.http.options.BaseHttpRequestOptions;

providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/predicates/OperationDonePredicate.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.predicates;
 
 import com.google.common.base.Predicate;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/GoogleComputeEngineApiMetadataTest.java

@@ -1,20 +1,18 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine;
 

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/GoogleComputeEngineAuthenticatedRestContextLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine;
 
 import org.jclouds.oauth.v2.internal.BaseOAuthAuthenticatedApiLiveTest;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/PageSystemExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine;
 
 import org.jclouds.collect.IterableWithMarker;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute;
 
 import com.google.common.base.Throwables;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute;
 
 import static org.testng.Assert.assertTrue;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/GoogleComputeEngineImageToImageTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.functions;
 
 import org.jclouds.compute.domain.OsFamily;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/OrphanedGroupsFromDeadNodesTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.compute.functions;
 
 import com.google.common.base.Predicate;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/DiskApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.testng.Assert.assertEquals;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/FirewallApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import com.google.common.collect.ImmutableSet;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ImageApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import com.google.common.collect.Iterables;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.domain.Instance;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/InstanceApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.testng.Assert.assertEquals;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/KernelApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/KernelApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import com.google.common.collect.Iterables;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/MachineTypeApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import com.google.common.collect.Iterables;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/NetworkApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import static org.testng.Assert.assertEquals;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/OperationApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/OperationApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import com.google.common.base.Predicate;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.GoogleComputeEngineConstants;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ProjectApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 /**

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneApiExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import org.jclouds.googlecomputeengine.internal.BaseGoogleComputeEngineApiExpectTest;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/features/ZoneApiLiveTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.features;
 
 import com.google.common.collect.Iterables;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/handlers/GoogleComputeEngineErrorHandlerTest.java

@@ -1,20 +1,18 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine.handlers;
 

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiExpectTest.java

@@ -1,20 +1,18 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine.internal;
 

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiLiveTest.java

@@ -1,20 +1,18 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine.internal;
 

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineExpectTest.java

@@ -1,20 +1,18 @@
-/**
+/*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
 package org.jclouds.googlecomputeengine.internal;
 

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineParseTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.internal;
 
 import com.google.inject.Guice;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineServiceContextExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.internal;
 
 import com.google.common.base.Function;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineServiceExpectTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.internal;
 
 import org.jclouds.compute.ComputeService;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskListTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.parse;
 
 import com.google.common.collect.ImmutableSet;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseDiskTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.parse;
 
 import org.jclouds.date.internal.SimpleDateFormatDateService;

providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseFirewallListTest.java

@@ -1,22 +1,19 @@
 /*
- * Licensed to jclouds, Inc. (jclouds) under one or more
+ * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file
+ * contributor license agreements.  See the NOTICE file distributed with
- * distributed with this work for additional information
+ * this work for additional information regarding copyright ownership.
- * regarding copyright ownership.  jclouds licenses this file
+ * The ASF licenses this file to You under the Apache License, Version 2.0
- * to you under the Apache License, Version 2.0 (the
+ * (the "License"); you may not use this file except in compliance with
- * "License"); you may not use this file except in compliance
+ * the License.  You may obtain a copy of the License at
- * 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,
+ * Unless required by applicable law or agreed to in writing, software
- * software distributed under the License is distributed on an
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * KIND, either express or implied.  See the License for the
+ * See the License for the specific language governing permissions and
- * specific language governing permissions and limitations
+ * limitations under the License.
- * under the License.
  */
-
 package org.jclouds.googlecomputeengine.parse;
 
 import com.google.common.collect.ImmutableSet;