Updated Branches: refs/heads/1.5.x fa53aa368 -> beee36d24
JCLOUDS-80. Inherit apache-rat plugin config. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/commit/beee36d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/tree/beee36d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/diff/beee36d2 Branch: refs/heads/1.5.x Commit: beee36d240a2f7f62208ed2c4f7732880a3e2b60 Parents: fa53aa3 Author: Andrew Bayer <[email protected]> Authored: Tue May 21 17:06:54 2013 -0400 Committer: Andrew Bayer <[email protected]> Committed: Tue May 21 17:06:54 2013 -0400 ---------------------------------------------------------------------- .../etc/org.apache.karaf.features.cfg | 16 ++++++++++++ .../etc/org.apache.karaf.features.repos.cfg | 17 +++++++++++++ .../filtered-resources/etc/org.jclouds.shell.cfg | 17 +++++++++++++ .../main/filtered-resources/etc/shell.init.script | 19 ++++++++++++++- branding/pom.xml | 15 +++++++++++ .../org/apache/karaf/branding/branding.properties | 16 ++++++++++++ pom.xml | 1 - 7 files changed, 99 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/beee36d2/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg index 7d80f20..51545bd 100644 --- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg +++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# featuresRepositories=mvn:org.jclouds.karaf/jclouds-karaf/${jclouds.karaf.version}/xml/features featuresBoot=config,jclouds-chef,jclouds-aws-ec2,jclouds-aws-s3 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/beee36d2/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg index 1370819..c2c61b0 100644 --- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg +++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.repos.cfg @@ -1,2 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + #Add here projects that can be embedded in the jclouds cli (e.g. extentions etc). whirr=org.apache.whirr.karaf:apache-whirr:xml:features:(0.8.0,] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/beee36d2/assembly/src/main/filtered-resources/etc/org.jclouds.shell.cfg ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/org.jclouds.shell.cfg b/assembly/src/main/filtered-resources/etc/org.jclouds.shell.cfg index 6b67cb8..beb9cd0 100644 --- a/assembly/src/main/filtered-resources/etc/org.jclouds.shell.cfg +++ b/assembly/src/main/filtered-resources/etc/org.jclouds.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-cli/blob/beee36d2/assembly/src/main/filtered-resources/etc/shell.init.script ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/etc/shell.init.script b/assembly/src/main/filtered-resources/etc/shell.init.script index 3b29e15..10091e7 100644 --- a/assembly/src/main/filtered-resources/etc/shell.init.script +++ b/assembly/src/main/filtered-resources/etc/shell.init.script @@ -1,4 +1,21 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this 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. +# + ld = { log:display $args } ; lde = { log:display-exception $args } ; cl = { config:list "(service.pid=$args)" } ; -man = { help $args } ; \ No newline at end of file +man = { help $args } ; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/beee36d2/branding/pom.xml ---------------------------------------------------------------------- diff --git a/branding/pom.xml b/branding/pom.xml index 33a8372..7d7b328 100644 --- a/branding/pom.xml +++ b/branding/pom.xml @@ -1,4 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +~ Copyright (C) 2012, the original authors +~ +~ Licensed under the Apache License, Version 2.0 (the "License"); +~ you may not use this 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-cli-pom</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/beee36d2/branding/src/main/resources/org/apache/karaf/branding/branding.properties ---------------------------------------------------------------------- diff --git a/branding/src/main/resources/org/apache/karaf/branding/branding.properties b/branding/src/main/resources/org/apache/karaf/branding/branding.properties index c46c73c..2aa9f63 100644 --- a/branding/src/main/resources/org/apache/karaf/branding/branding.properties +++ b/branding/src/main/resources/org/apache/karaf/branding/branding.properties @@ -1,3 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# welcome = \ \u001B[36m _ _ _ \u001B[0m\n\ \u001B[36m (_) | | | | \u001B[0m\n\ http://git-wip-us.apache.org/repos/asf/incubator-jclouds-cli/blob/beee36d2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index dfdd734..7ca59c2 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,6 @@ <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <version>0.8</version> - <inherited>false</inherited> <executions> <execution> <phase>package</phase>
