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

[4/4] git commit: JCLOUDS-59: Update to Apache license

JCLOUDS-59: Update to Apache license

This commit allows mvn -N apache-rat:check to pass.


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

Branch: refs/heads/master
Commit: 79d1b8fe882a6d20347ac1e124038605d625104e
Parents: 5ba3068
Author: Andrew Gaul <ga...@maginatics.com>
Authored: Mon May 20 00:09:49 2013 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon May 20 21:55:24 2013 -0700

----------------------------------------------------------------------
 cache/pom.xml                                      |   26 ++++++-------
 .../java/org/jclouds/karaf/cache/Activator.java    |   28 ++++++-------
 .../jclouds/karaf/cache/BasicCacheProvider.java    |   28 ++++++-------
 .../java/org/jclouds/karaf/cache/CacheManager.java |   28 ++++++-------
 .../org/jclouds/karaf/cache/CacheProvider.java     |   28 ++++++-------
 .../java/org/jclouds/karaf/cache/Cacheable.java    |   28 ++++++-------
 .../karaf/cache/tasks/UpdateCachesTask.java        |   28 ++++++-------
 .../org/jclouds/karaf/cache/utils/CacheUtils.java  |   28 ++++++-------
 chef/cache/pom.xml                                 |   28 ++++++-------
 .../org/jclouds/karaf/chef/cache/Activator.java    |   28 ++++++-------
 chef/commands/pom.xml                              |   28 ++++++-------
 .../karaf/chef/commands/ChefCommandBase.java       |   28 ++++++-------
 .../chef/commands/ChefCommandWithOptions.java      |   28 ++++++-------
 .../chef/commands/ChefCookbookListCommand.java     |   28 ++++++-------
 .../karaf/chef/commands/ChefGroupBootStrap.java    |   28 ++++++-------
 .../karaf/chef/commands/ChefNodeBootstrap.java     |   28 ++++++-------
 .../karaf/chef/commands/ChefRunscriptBase.java     |   28 ++++++-------
 .../chef/commands/ChefServiceCreateCommand.java    |   28 ++++++-------
 .../chef/commands/ChefServiceDestroyCommand.java   |   28 ++++++-------
 .../chef/commands/ChefServiceListCommand.java      |   28 ++++++-------
 .../chef/commands/completer/ChefApiCompleter.java  |   28 ++++++-------
 .../commands/completer/ChefCompleterSupport.java   |   28 ++++++-------
 .../completer/ChefContextNameCompleter.java        |   28 ++++++-------
 .../chef/commands/completer/CookbookCompleter.java |   28 ++++++-------
 .../OSGI-INF/blueprint/jclouds-chef-commands.xml   |   29 +++++++-------
 chef/core/pom.xml                                  |   28 ++++++-------
 .../org/jclouds/karaf/chef/core/ChefConstants.java |   28 ++++++-------
 .../org/jclouds/karaf/chef/core/ChefHelper.java    |   28 ++++++-------
 chef/services/pom.xml                              |   28 ++++++-------
 .../org/jclouds/karaf/chef/services/Activator.java |   28 ++++++-------
 .../karaf/chef/services/ChefRecipeProvider.java    |   28 ++++++-------
 .../karaf/chef/services/ChefServiceFactory.java    |   28 ++++++-------
 .../chef/services/EnvBasedChefRecipeProvider.java  |   28 ++++++-------
 commands/pom.xml                                   |   26 ++++++-------
 .../karaf/commands/blobstore/BlobListCommand.java  |   28 ++++++-------
 .../commands/blobstore/BlobMetadataCommand.java    |   28 ++++++-------
 .../karaf/commands/blobstore/BlobReadCommand.java  |   28 ++++++-------
 .../commands/blobstore/BlobRemoveCommand.java      |   28 ++++++-------
 .../commands/blobstore/BlobStoreCommandBase.java   |   28 ++++++-------
 .../blobstore/BlobStoreCommandWithOptions.java     |   28 ++++++-------
 .../blobstore/BlobStoreServiceCreateCommand.java   |   28 ++++++-------
 .../blobstore/BlobStoreServiceDestroyCommand.java  |   28 ++++++-------
 .../blobstore/BlobStoreServiceListCommand.java     |   28 ++++++-------
 .../karaf/commands/blobstore/BlobWriteCommand.java |   28 ++++++-------
 .../commands/blobstore/ContainerClearCommand.java  |   28 ++++++-------
 .../commands/blobstore/ContainerCreateCommand.java |   28 ++++++-------
 .../commands/blobstore/ContainerDeleteCommand.java |   28 ++++++-------
 .../commands/blobstore/ContainerExistsCommand.java |   28 ++++++-------
 .../commands/blobstore/ContainerListCommand.java   |   28 ++++++-------
 .../blobstore/ContainerMetadataCommand.java        |   28 ++++++-------
 .../commands/blobstore/LocationListCommand.java    |   28 ++++++-------
 .../blobstore/completer/BlobCompleter.java         |   28 ++++++-------
 .../blobstore/completer/BlobStoreApiCompleter.java |   28 ++++++-------
 .../completer/BlobStoreCompleterSupport.java       |   28 ++++++-------
 .../completer/BlobStoreContextNameCompleter.java   |   28 ++++++-------
 .../completer/BlobStoreProviderCompleter.java      |   28 ++++++-------
 .../blobstore/completer/ContainerCompleter.java    |   28 ++++++-------
 .../karaf/commands/compute/ComputeCommandBase.java |   28 ++++++-------
 .../compute/ComputeCommandWithOptions.java         |   28 ++++++-------
 .../commands/compute/ComputeRunscriptBase.java     |   28 ++++++-------
 .../compute/ComputeServiceCreateCommand.java       |   28 ++++++-------
 .../compute/ComputeServiceDestroyCommand.java      |   28 ++++++-------
 .../compute/ComputeServiceListCommand.java         |   28 ++++++-------
 .../commands/compute/GroupDestroyCommand.java      |   28 ++++++-------
 .../commands/compute/GroupRunScriptCommand.java    |   28 ++++++-------
 .../commands/compute/HardwareListCommand.java      |   28 ++++++-------
 .../karaf/commands/compute/ImageCreateCommand.java |   28 ++++++-------
 .../karaf/commands/compute/ImageListCommand.java   |   28 ++++++-------
 .../commands/compute/LocationListCommand.java      |   28 ++++++-------
 .../karaf/commands/compute/NodeCreateCommand.java  |   28 ++++++-------
 .../commands/compute/NodeDestroyAllCommand.java    |   28 ++++++-------
 .../karaf/commands/compute/NodeDestroyCommand.java |   28 ++++++-------
 .../karaf/commands/compute/NodeInfoCommand.java    |   28 ++++++-------
 .../karaf/commands/compute/NodeListCommand.java    |   28 ++++++-------
 .../karaf/commands/compute/NodeResumeCommand.java  |   28 ++++++-------
 .../commands/compute/NodeRunScriptCommand.java     |   28 ++++++-------
 .../karaf/commands/compute/NodeSuspendCommand.java |   28 ++++++-------
 .../commands/compute/ProviderInfoCommand.java      |   28 ++++++-------
 .../karaf/commands/compute/RunScriptBase.java      |   28 ++++++-------
 .../compute/completer/ActiveNodesCompleter.java    |   28 ++++++-------
 .../compute/completer/ComputeApiCompleter.java     |   28 ++++++-------
 .../compute/completer/ComputeCompleterSupport.java |   28 ++++++-------
 .../completer/ComputeContextNameCompleter.java     |   28 ++++++-------
 .../completer/ComputeProviderCompleter.java        |   28 ++++++-------
 .../commands/compute/completer/GroupCompleter.java |   28 ++++++-------
 .../compute/completer/HardwareCompleter.java       |   28 ++++++-------
 .../commands/compute/completer/ImageCompleter.java |   28 ++++++-------
 .../compute/completer/InactiveNodesCompleter.java  |   28 ++++++-------
 .../compute/completer/LocationCompleter.java       |   28 ++++++-------
 .../commands/compute/completer/NodesCompleter.java |   28 ++++++-------
 .../compute/completer/OsFamilyCompleter.java       |   28 ++++++-------
 .../compute/completer/RecipeCompleter.java         |   28 ++++++-------
 .../compute/completer/SuspendedNodesCompleter.java |   28 ++++++-------
 .../commands/support/GenericCompleterSupport.java  |   28 ++++++-------
 .../karaf/commands/table/BasicShellTable.java      |   28 ++++++-------
 .../commands/table/BasicShellTableFactory.java     |   28 ++++++-------
 .../jclouds/karaf/commands/table/ShellTable.java   |   28 ++++++-------
 .../karaf/commands/table/ShellTableFactory.java    |   28 ++++++-------
 .../table/internal/AlphanumericComparator.java     |   28 ++++++-------
 .../table/internal/ManagedShellTableFactory.java   |   28 ++++++-------
 .../table/internal/PropertyShellTableFactory.java  |   28 ++++++-------
 .../table/internal/ScriptEngineShellTable.java     |   28 ++++++-------
 .../OSGI-INF/blueprint/jclouds-commands.xml        |   26 ++++++-------
 core/pom.xml                                       |   26 ++++++-------
 .../karaf/core/ComputeServiceEventProxy.java       |   28 ++++++-------
 .../java/org/jclouds/karaf/core/Constants.java     |   28 ++++++-------
 .../org/jclouds/karaf/core/CredentialStore.java    |   19 ---------
 .../java/org/jclouds/karaf/core/NodeListener.java  |   28 ++++++-------
 feature/pom.xml                                    |   26 ++++++-------
 feature/src/main/resources/feature.xml             |   26 ++++++-------
 itests/pom.xml                                     |   30 +++++++--------
 .../karaf/itests/ApisFeaturesInstallationTest.java |   28 ++++++-------
 .../karaf/itests/AwsFeaturesInstallationTest.java  |   28 ++++++-------
 .../karaf/itests/ChefFeaturesInstallationTest.java |   28 ++++++-------
 .../ElasticHostsFeaturesInstallationTest.java      |   28 ++++++-------
 .../itests/HPCloudFeaturesInstallationTest.java    |   28 ++++++-------
 .../karaf/itests/JcloudsFeaturesTestSupport.java   |   28 ++++++-------
 .../karaf/itests/JcloudsKarafTestSupport.java      |   28 ++++++-------
 .../karaf/itests/MiscFeaturesInstallationTest.java |   28 ++++++-------
 .../org/jclouds/karaf/itests/ObrResolverTest.java  |   28 ++++++-------
 .../itests/RackspaceFeaturesInstallationTest.java  |   28 ++++++-------
 .../jclouds/karaf/itests/live/AwsEc2LiveTest.java  |   28 ++++++-------
 .../jclouds/karaf/itests/live/AwsS3LiveTest.java   |   28 ++++++-------
 .../karaf/itests/live/CloudFilesUsLiveTest.java    |   28 ++++++-------
 .../karaf/itests/live/JcloudsLiveTestSupport.java  |   28 ++++++-------
 .../karaf/itests/live/RackspaceLiveTest.java       |   28 ++++++-------
 .../JcloudsCamelCxfFeaturesTestSupport.java        |   28 ++++++-------
 pom.xml                                            |   30 +++++++--------
 recipe/pom.xml                                     |   28 ++++++-------
 .../java/org/jclouds/karaf/recipe/Activator.java   |   28 ++++++-------
 .../org/jclouds/karaf/recipe/RecipeManager.java    |   28 ++++++-------
 .../jclouds/karaf/recipe/RecipeManagerImpl.java    |   28 ++++++-------
 .../org/jclouds/karaf/recipe/RecipeProvider.java   |   28 ++++++-------
 .../karaf/recipe/RecipeProviderPredicates.java     |   28 ++++++-------
 .../org/jclouds/karaf/recipe/RecipeProviders.java  |   28 ++++++-------
 services/pom.xml                                   |   26 ++++++-------
 .../services/InvalidConfigurationException.java    |   28 ++++++-------
 .../karaf/services/ServiceFactorySupport.java      |   28 ++++++-------
 .../jclouds/karaf/services/internal/Activator.java |   28 ++++++-------
 .../services/internal/BlobStoreServiceFactory.java |   28 ++++++-------
 .../services/internal/ComputeServiceFactory.java   |   28 ++++++-------
 .../modules/ConfigurationAdminCredentialStore.java |   28 ++++++-------
 .../modules/PropertiesCredentialStore.java         |   28 ++++++-------
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   28 ++++++-------
 .../services/ServiceFactoryValidationTest.java     |   28 ++++++-------
 urlhandler/pom.xml                                 |   26 ++++++-------
 .../jclouds/karaf/urlhandler/BlobUrlHandler.java   |   28 ++++++-------
 .../resources/OSGI-INF/blueprint/blueprint.xml     |   26 ++++++-------
 utils/pom.xml                                      |   26 ++++++-------
 .../java/org/jclouds/karaf/utils/EnvHelper.java    |   28 ++++++-------
 .../org/jclouds/karaf/utils/ServiceHelper.java     |   28 ++++++-------
 151 files changed, 1943 insertions(+), 2261 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/cache/pom.xml
----------------------------------------------------------------------
diff --git a/cache/pom.xml b/cache/pom.xml
index 4b72ee4..4065e40 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to jclouds, Inc. (jclouds) under one or more
-contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  jclouds licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/cache/src/main/java/org/jclouds/karaf/cache/Activator.java
----------------------------------------------------------------------
diff --git a/cache/src/main/java/org/jclouds/karaf/cache/Activator.java b/cache/src/main/java/org/jclouds/karaf/cache/Activator.java
index cc89cd9..d20bcd2 100644
--- a/cache/src/main/java/org/jclouds/karaf/cache/Activator.java
+++ b/cache/src/main/java/org/jclouds/karaf/cache/Activator.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.jclouds.karaf.cache;
 

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/cache/src/main/java/org/jclouds/karaf/cache/BasicCacheProvider.java
----------------------------------------------------------------------
diff --git a/cache/src/main/java/org/jclouds/karaf/cache/BasicCacheProvider.java b/cache/src/main/java/org/jclouds/karaf/cache/BasicCacheProvider.java
index 900ccdb..964465d 100644
--- a/cache/src/main/java/org/jclouds/karaf/cache/BasicCacheProvider.java
+++ b/cache/src/main/java/org/jclouds/karaf/cache/BasicCacheProvider.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.cache;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/cache/src/main/java/org/jclouds/karaf/cache/CacheManager.java
----------------------------------------------------------------------
diff --git a/cache/src/main/java/org/jclouds/karaf/cache/CacheManager.java b/cache/src/main/java/org/jclouds/karaf/cache/CacheManager.java
index 4319c4c..0f04838 100644
--- a/cache/src/main/java/org/jclouds/karaf/cache/CacheManager.java
+++ b/cache/src/main/java/org/jclouds/karaf/cache/CacheManager.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.cache;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/cache/src/main/java/org/jclouds/karaf/cache/CacheProvider.java
----------------------------------------------------------------------
diff --git a/cache/src/main/java/org/jclouds/karaf/cache/CacheProvider.java b/cache/src/main/java/org/jclouds/karaf/cache/CacheProvider.java
index 7d6108b..3108a25 100644
--- a/cache/src/main/java/org/jclouds/karaf/cache/CacheProvider.java
+++ b/cache/src/main/java/org/jclouds/karaf/cache/CacheProvider.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.cache;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/cache/src/main/java/org/jclouds/karaf/cache/Cacheable.java
----------------------------------------------------------------------
diff --git a/cache/src/main/java/org/jclouds/karaf/cache/Cacheable.java b/cache/src/main/java/org/jclouds/karaf/cache/Cacheable.java
index f1a5686..8e6a8f0 100644
--- a/cache/src/main/java/org/jclouds/karaf/cache/Cacheable.java
+++ b/cache/src/main/java/org/jclouds/karaf/cache/Cacheable.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.cache;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/cache/src/main/java/org/jclouds/karaf/cache/tasks/UpdateCachesTask.java
----------------------------------------------------------------------
diff --git a/cache/src/main/java/org/jclouds/karaf/cache/tasks/UpdateCachesTask.java b/cache/src/main/java/org/jclouds/karaf/cache/tasks/UpdateCachesTask.java
index 7bcbc4d..fc9adf1 100644
--- a/cache/src/main/java/org/jclouds/karaf/cache/tasks/UpdateCachesTask.java
+++ b/cache/src/main/java/org/jclouds/karaf/cache/tasks/UpdateCachesTask.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.cache.tasks;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java
----------------------------------------------------------------------
diff --git a/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java b/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java
index 4a92c63..f6ed062 100644
--- a/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java
+++ b/cache/src/main/java/org/jclouds/karaf/cache/utils/CacheUtils.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.cache.utils;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/cache/pom.xml
----------------------------------------------------------------------
diff --git a/chef/cache/pom.xml b/chef/cache/pom.xml
index 11c490d..4dabd37 100644
--- a/chef/cache/pom.xml
+++ b/chef/cache/pom.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to jclouds, Inc. (jclouds) under one or more
-contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  jclouds licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -74,4 +72,4 @@ under the License.
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java
----------------------------------------------------------------------
diff --git a/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java b/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java
index 5779eab..70ec099 100644
--- a/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java
+++ b/chef/cache/src/main/java/org/jclouds/karaf/chef/cache/Activator.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.cache;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/pom.xml
----------------------------------------------------------------------
diff --git a/chef/commands/pom.xml b/chef/commands/pom.xml
index 88bd933..51827d7 100644
--- a/chef/commands/pom.xml
+++ b/chef/commands/pom.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to jclouds, Inc. (jclouds) under one or more
-contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  jclouds licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -122,4 +120,4 @@ under the License.
       <artifactId>slf4j-api</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandBase.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandBase.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandBase.java
index 64aa440..841c88f 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandBase.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandBase.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java
index c6f69e8..3ddaf8f 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCommandWithOptions.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCookbookListCommand.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCookbookListCommand.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCookbookListCommand.java
index c5947b7..e4a56f8 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCookbookListCommand.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefCookbookListCommand.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java
index 4809b28..aebc5ba 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefGroupBootStrap.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java
index 22a7ef7..b41e6f2 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefNodeBootstrap.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefRunscriptBase.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefRunscriptBase.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefRunscriptBase.java
index f7f8eaf..66d55c4 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefRunscriptBase.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefRunscriptBase.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java
index e2d683d..ac48668 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceCreateCommand.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceDestroyCommand.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceDestroyCommand.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceDestroyCommand.java
index 97f0354..d5afc10 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceDestroyCommand.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceDestroyCommand.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceListCommand.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceListCommand.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceListCommand.java
index bf1c96f..ff40c3c 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceListCommand.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/ChefServiceListCommand.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefApiCompleter.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefApiCompleter.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefApiCompleter.java
index 7d43829..8a42f49 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefApiCompleter.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefApiCompleter.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands.completer;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefCompleterSupport.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefCompleterSupport.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefCompleterSupport.java
index 20f843a..0f7eab1 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefCompleterSupport.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefCompleterSupport.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands.completer;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefContextNameCompleter.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefContextNameCompleter.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefContextNameCompleter.java
index 0ba0448..9f82181 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefContextNameCompleter.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/ChefContextNameCompleter.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands.completer;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/CookbookCompleter.java
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/CookbookCompleter.java b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/CookbookCompleter.java
index 0ed031c..e5b2245 100644
--- a/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/CookbookCompleter.java
+++ b/chef/commands/src/main/java/org/jclouds/karaf/chef/commands/completer/CookbookCompleter.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.commands.completer;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/commands/src/main/resources/OSGI-INF/blueprint/jclouds-chef-commands.xml
----------------------------------------------------------------------
diff --git a/chef/commands/src/main/resources/OSGI-INF/blueprint/jclouds-chef-commands.xml b/chef/commands/src/main/resources/OSGI-INF/blueprint/jclouds-chef-commands.xml
index 5ae924d..b023295 100644
--- a/chef/commands/src/main/resources/OSGI-INF/blueprint/jclouds-chef-commands.xml
+++ b/chef/commands/src/main/resources/OSGI-INF/blueprint/jclouds-chef-commands.xml
@@ -1,21 +1,20 @@
 <!--
-  Licensed to jclouds, Inc. (jclouds) under one or more
-  contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  jclouds licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-  -->
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0">
 
@@ -162,4 +161,4 @@
     <reference-list id="chefServices" interface="org.jclouds.chef.ChefService" availability="optional"/>
     <reference id="configAdmin" interface="org.osgi.service.cm.ConfigurationAdmin" availability="optional"/>
 
-</blueprint>
\ No newline at end of file
+</blueprint>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/core/pom.xml
----------------------------------------------------------------------
diff --git a/chef/core/pom.xml b/chef/core/pom.xml
index eb9ed48..8699797 100644
--- a/chef/core/pom.xml
+++ b/chef/core/pom.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to jclouds, Inc. (jclouds) under one or more
-contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  jclouds licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -60,4 +58,4 @@ under the License.
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefConstants.java
----------------------------------------------------------------------
diff --git a/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefConstants.java b/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefConstants.java
index 4d1d8ab..1fa7352 100644
--- a/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefConstants.java
+++ b/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefConstants.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.core;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefHelper.java
----------------------------------------------------------------------
diff --git a/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefHelper.java b/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefHelper.java
index 176ad7f..05da251 100644
--- a/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefHelper.java
+++ b/chef/core/src/main/java/org/jclouds/karaf/chef/core/ChefHelper.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.core;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/services/pom.xml
----------------------------------------------------------------------
diff --git a/chef/services/pom.xml b/chef/services/pom.xml
index 0fd71ef..6bc5e93 100644
--- a/chef/services/pom.xml
+++ b/chef/services/pom.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to jclouds, Inc. (jclouds) under one or more
-contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  jclouds licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -92,4 +90,4 @@ under the License.
     </dependency>
   </dependencies>
 
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java
----------------------------------------------------------------------
diff --git a/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java b/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java
index 20ab4e7..fe6fea6 100644
--- a/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java
+++ b/chef/services/src/main/java/org/jclouds/karaf/chef/services/Activator.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.services;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java
----------------------------------------------------------------------
diff --git a/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java b/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java
index e6f820b..f4e8a55 100644
--- a/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java
+++ b/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefRecipeProvider.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.services;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefServiceFactory.java
----------------------------------------------------------------------
diff --git a/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefServiceFactory.java b/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefServiceFactory.java
index a8739a4..2eda6ac 100644
--- a/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefServiceFactory.java
+++ b/chef/services/src/main/java/org/jclouds/karaf/chef/services/ChefServiceFactory.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.services;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/chef/services/src/main/java/org/jclouds/karaf/chef/services/EnvBasedChefRecipeProvider.java
----------------------------------------------------------------------
diff --git a/chef/services/src/main/java/org/jclouds/karaf/chef/services/EnvBasedChefRecipeProvider.java b/chef/services/src/main/java/org/jclouds/karaf/chef/services/EnvBasedChefRecipeProvider.java
index 00a8cec..f074922 100644
--- a/chef/services/src/main/java/org/jclouds/karaf/chef/services/EnvBasedChefRecipeProvider.java
+++ b/chef/services/src/main/java/org/jclouds/karaf/chef/services/EnvBasedChefRecipeProvider.java
@@ -1,20 +1,18 @@
-/**
- * Licensed to jclouds, Inc. (jclouds) under one or more
- * contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  jclouds licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jclouds.karaf.chef.services;

http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/79d1b8fe/commands/pom.xml
----------------------------------------------------------------------
diff --git a/commands/pom.xml b/commands/pom.xml
index 0d14058..6dcb502 100644
--- a/commands/pom.xml
+++ b/commands/pom.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed to jclouds, Inc. (jclouds) under one or more
-contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  jclouds licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>