Updated Branches: refs/heads/1.6.x c128143d1 -> 66a377dd3
JCLOUDS-80. Inherit apache-rat plugin config. 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/66a377dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/66a377dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/66a377dd Branch: refs/heads/1.6.x Commit: 66a377dd3528ffb4cff97f5b1664a1b71e87a3b9 Parents: c128143 Author: Andrew Bayer <[email protected]> Authored: Wed May 22 10:20:41 2013 -0400 Committer: Andrew Bayer <[email protected]> Committed: Wed May 22 10:21:39 2013 -0400 ---------------------------------------------------------------------- .../services/org/apache/karaf/shell/commands | 19 ++++++++++++++- chef/pom.xml | 19 +++++++++++++++ .../org.jclouds.karaf.recipe.RecipeProvider | 19 ++++++++++++++- .../services/org/apache/karaf/shell/commands | 17 +++++++++++++ .../org/jclouds/karaf/core/CredentialStore.java | 19 +++++++++++++++ feature/src/main/resources/credentials.cfg | 17 +++++++++++++ feature/src/main/resources/shell.cfg | 17 +++++++++++++ pom.xml | 4 ++- 8 files changed, 128 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/66a377dd/chef/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands ---------------------------------------------------------------------- diff --git a/chef/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands b/chef/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands index 0177a6e..9c00e18 100644 --- a/chef/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands +++ b/chef/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this 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. +# + org.jclouds.karaf.chef.commands.ChefCookbookListCommand org.jclouds.karaf.chef.commands.ChefNodeBootstrap -org.jclouds.karaf.chef.commands.ChefGroupBootStrap \ No newline at end of file +org.jclouds.karaf.chef.commands.ChefGroupBootStrap http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/66a377dd/chef/pom.xml ---------------------------------------------------------------------- diff --git a/chef/pom.xml b/chef/pom.xml index 9d31c7f..4a1aeac 100644 --- a/chef/pom.xml +++ b/chef/pom.xml @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- +Licensed to jclouds, Inc. (jclouds) under one or more +contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. jclouds licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <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> <artifactId>jclouds-karaf-pom</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/66a377dd/chef/services/src/main/resources/META-INF/services/org.jclouds.karaf.recipe.RecipeProvider ---------------------------------------------------------------------- diff --git a/chef/services/src/main/resources/META-INF/services/org.jclouds.karaf.recipe.RecipeProvider b/chef/services/src/main/resources/META-INF/services/org.jclouds.karaf.recipe.RecipeProvider index c6fe08a..3fe0be4 100644 --- a/chef/services/src/main/resources/META-INF/services/org.jclouds.karaf.recipe.RecipeProvider +++ b/chef/services/src/main/resources/META-INF/services/org.jclouds.karaf.recipe.RecipeProvider @@ -1 +1,18 @@ -org.jclouds.karaf.chef.services.EnvBasedChefRecipeProvider \ No newline at end of file +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this 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. +# + +org.jclouds.karaf.chef.services.EnvBasedChefRecipeProvider http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/66a377dd/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands ---------------------------------------------------------------------- diff --git a/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands b/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands index dca9fe9..e25e736 100644 --- a/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands +++ b/commands/src/main/resources/META-INF/services/org/apache/karaf/shell/commands @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this 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. +# + org.jclouds.karaf.commands.compute.ImageCreateCommand org.jclouds.karaf.commands.compute.ImageListCommand org.jclouds.karaf.commands.compute.HardwareListCommand http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/66a377dd/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java b/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java index 85226cb..214f30d 100644 --- a/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java +++ b/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java @@ -1,3 +1,22 @@ +/** + * Licensed to jclouds, Inc. (jclouds) under one or more + * contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. jclouds licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.jclouds.karaf.core; import com.google.inject.AbstractModule; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/66a377dd/feature/src/main/resources/credentials.cfg ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/credentials.cfg b/feature/src/main/resources/credentials.cfg index 5eae390..b5ed2f6 100644 --- a/feature/src/main/resources/credentials.cfg +++ b/feature/src/main/resources/credentials.cfg @@ -1 +1,18 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this 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. +# + service.pid = org.jclouds.credentials \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/66a377dd/feature/src/main/resources/shell.cfg ---------------------------------------------------------------------- diff --git a/feature/src/main/resources/shell.cfg b/feature/src/main/resources/shell.cfg index a298c43..f8639aa 100644 --- a/feature/src/main/resources/shell.cfg +++ b/feature/src/main/resources/shell.cfg @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this 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. +# + #This is the default configuration for the jclouds command output. #All entries are prefixed by type. #headers: The headers that will be displayed by the table. http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/66a377dd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 24ef433..303b926 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,6 @@ limitations under the License. <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>0.8</version> - <inherited>false</inherited> <executions> <execution> <phase>package</phase> @@ -89,6 +88,9 @@ limitations under the License. <exclude>**/.checkstyle</exclude> <exclude>**/target/**</exclude> <exclude>.repository/**</exclude> + + <!-- Excluded because these text files are spat out directly as help --> + <exclude>**/src/main/resources/**/*.txt</exclude> <!-- binary --> </excludes> </configuration>
