Updated Branches: refs/heads/1.6.x e9e0968a4 -> 0544cc3ce
Add license headers to src/test/resources where possible, more fine-grained RAT exclusions Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/commit/9b03f68c Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/tree/9b03f68c Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/diff/9b03f68c Branch: refs/heads/1.6.x Commit: 9b03f68c72112b9579bc9cd02b060b6fa04f968d Parents: e9e0968 Author: Andrew Bayer <[email protected]> Authored: Mon Jun 10 11:45:39 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Mon Jun 10 11:45:39 2013 -0700 ---------------------------------------------------------------------- abiquo/src/test/resources/api-live.properties | 21 ++++++++++++++++++ .../test/resources/filters/filters.properties | 23 +++++++++++++++++++- abiquo/src/test/resources/license/expired | 22 ++++++++++++++++++- pom.xml | 10 +++++++-- .../src/test/resources/default-images.yaml | 20 ++++++++++++++++- .../test/resources/default-keystroke-sequence | 20 ++++++++++++++++- .../resources/redHatAndDerivatives/hostOnly | 18 +++++++++++++++ .../src/test/resources/redHatAndDerivatives/nat | 18 +++++++++++++++ 8 files changed, 146 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/9b03f68c/abiquo/src/test/resources/api-live.properties ---------------------------------------------------------------------- diff --git a/abiquo/src/test/resources/api-live.properties b/abiquo/src/test/resources/api-live.properties index a452389..dfaa959 100644 --- a/abiquo/src/test/resources/api-live.properties +++ b/abiquo/src/test/resources/api-live.properties @@ -1,3 +1,24 @@ +# +# +# 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. +# +# + # Hypervisor configuration abiquo.hypervisor.type = ${abiquo.hypervisor.type} abiquo.hypervisor.address = ${abiquo.hypervisor.address} http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/9b03f68c/abiquo/src/test/resources/filters/filters.properties ---------------------------------------------------------------------- diff --git a/abiquo/src/test/resources/filters/filters.properties b/abiquo/src/test/resources/filters/filters.properties index 3cc6495..48f4cab 100644 --- a/abiquo/src/test/resources/filters/filters.properties +++ b/abiquo/src/test/resources/filters/filters.properties @@ -1,3 +1,24 @@ +# +# +# 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. +# +# + # Hypervisor configuration # This is the Tarantino IT hypervisor. # Should be replaced with a dedicated ESX asap! @@ -23,4 +44,4 @@ abiquo.storage.pool=abiquo abiquo.ucs.address=10.60.1.45 abiquo.ucs.port=80 abiquo.ucs.pass=config -abiquo.ucs.user=config \ No newline at end of file +abiquo.ucs.user=config http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/9b03f68c/abiquo/src/test/resources/license/expired ---------------------------------------------------------------------- diff --git a/abiquo/src/test/resources/license/expired b/abiquo/src/test/resources/license/expired index 1db9f51..c73a711 100644 --- a/abiquo/src/test/resources/license/expired +++ b/abiquo/src/test/resources/license/expired @@ -1 +1,21 @@ -B9cG06GaLHhUlpD9AWxKVkZPd4qPB0OAbm2Blr4374Y6rtPhcukg4MMLNK0uWn5fnsoBSqVX8o0hwQ1I6D3zUbFBSibMaK5xIZQfZmReHf04HPPBg0ZyaPRTBoKy6dCLnWpQIKe8vLemAudZ0w4spdzYMH2jw2TImN+2vd4QDU1qmUItYMsV5Sz+e8YVEGbUVkjRjQCmIUJskVxC+sW47dokgl5Qo8hN+4I6vKgEnXFdOSRFW2cyGgpHVH4Js4hwLG+PS2LXPS4UwvISJXRF6tO7Rgg9iaObcBD/byH5jGmggtSECUtXqI70nesIbMXRHQ1aGHARqbHH3+0Znjcu5g== \ 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. +# +# +B9cG06GaLHhUlpD9AWxKVkZPd4qPB0OAbm2Blr4374Y6rtPhcukg4MMLNK0uWn5fnsoBSqVX8o0hwQ1I6D3zUbFBSibMaK5xIZQfZmReHf04HPPBg0ZyaPRTBoKy6dCLnWpQIKe8vLemAudZ0w4spdzYMH2jw2TImN+2vd4QDU1qmUItYMsV5Sz+e8YVEGbUVkjRjQCmIUJskVxC+sW47dokgl5Qo8hN+4I6vKgEnXFdOSRFW2cyGgpHVH4Js4hwLG+PS2LXPS4UwvISJXRF6tO7Rgg9iaObcBD/byH5jGmggtSECUtXqI70nesIbMXRHQ1aGHARqbHH3+0Znjcu5g== http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/9b03f68c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 12dd0e0..b97eb98 100644 --- a/pom.xml +++ b/pom.xml @@ -104,8 +104,14 @@ <configuration> <excludes> <!-- expectation files for unit tests --> - <exclude>**/src/test/resources/**</exclude> - + <exclude>**/src/test/resources/**/*.sh</exclude> + <exclude>**/src/test/resources/**/*.bat</exclude> + <exclude>**/src/test/resources/**/*.cmd</exclude> + <exclude>**/src/test/resources/**/*.txt</exclude> + <exclude>**/src/test/resources/**/*.gz</exclude> + <exclude>**/src/test/resources/**/*.xml</exclude> + <exclude>**/src/test/resources/**/*.iso</exclude> + <!-- prevent duplicating license --> <exclude>**/LICENSE.txt</exclude> <exclude>**/header.txt</exclude> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/9b03f68c/virtualbox/src/test/resources/default-images.yaml ---------------------------------------------------------------------- diff --git a/virtualbox/src/test/resources/default-images.yaml b/virtualbox/src/test/resources/default-images.yaml index 1714f79..20ad2e3 100644 --- a/virtualbox/src/test/resources/default-images.yaml +++ b/virtualbox/src/test/resources/default-images.yaml @@ -1,3 +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. +# images: - id: ubuntu-12.04.1-amd64 name: ubuntu-12.04.1-server-amd64 @@ -140,4 +158,4 @@ images: echo "toor ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/toor chmod 0440 /etc/sudoers.d/toor sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers - %end \ No newline at end of file + %end http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/9b03f68c/virtualbox/src/test/resources/default-keystroke-sequence ---------------------------------------------------------------------- diff --git a/virtualbox/src/test/resources/default-keystroke-sequence b/virtualbox/src/test/resources/default-keystroke-sequence index be075ae..bcfd94b 100644 --- a/virtualbox/src/test/resources/default-keystroke-sequence +++ b/virtualbox/src/test/resources/default-keystroke-sequence @@ -1 +1,19 @@ -<Esc><Esc><Enter> /install/vmlinuz noapic preseed/url=PRECONFIGURATION_URL debian-installer=en_US auto locale=en_US kbd-chooser/method=us hostname=hostname fb=false debconf/frontend=noninteractive console-setup/ask_detect=false keyboard-configuration/layoutcode=us " initrd=/install/initrd.gz -- <Enter> \ 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. +# +<Esc><Esc><Enter> /install/vmlinuz noapic preseed/url=PRECONFIGURATION_URL debian-installer=en_US auto locale=en_US kbd-chooser/method=us hostname=hostname fb=false debconf/frontend=noninteractive console-setup/ask_detect=false keyboard-configuration/layoutcode=us " initrd=/install/initrd.gz -- <Enter> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/9b03f68c/virtualbox/src/test/resources/redHatAndDerivatives/hostOnly ---------------------------------------------------------------------- diff --git a/virtualbox/src/test/resources/redHatAndDerivatives/hostOnly b/virtualbox/src/test/resources/redHatAndDerivatives/hostOnly index 44aef55..ac4d33b 100644 --- a/virtualbox/src/test/resources/redHatAndDerivatives/hostOnly +++ b/virtualbox/src/test/resources/redHatAndDerivatives/hostOnly @@ -1,3 +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. +# #!/bin/bash sudo ip link set eth1 name eth0 # configure eth0 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs/blob/9b03f68c/virtualbox/src/test/resources/redHatAndDerivatives/nat ---------------------------------------------------------------------- diff --git a/virtualbox/src/test/resources/redHatAndDerivatives/nat b/virtualbox/src/test/resources/redHatAndDerivatives/nat index a27d202..a51482c 100644 --- a/virtualbox/src/test/resources/redHatAndDerivatives/nat +++ b/virtualbox/src/test/resources/redHatAndDerivatives/nat @@ -1,3 +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. +# #!/bin/bash sudo ip link set eth2 name eth1 sudo cp /etc/sysconfig/network-scripts/ifcfg-eth0 /tmp/ifcfg-eth1
