Updated Branches: refs/heads/master d0fdbe3d2 -> 133ffc362
JCLOUDS-80. Inherit apache-rat plugin config. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/commit/133ffc36 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/133ffc36 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/133ffc36 Branch: refs/heads/master Commit: 133ffc3626d398a529a7f25173c9d395cec01e8b Parents: d0fdbe3 Author: Andrew Bayer <[email protected]> Authored: Wed May 22 10:34:31 2013 -0400 Committer: Andrew Bayer <[email protected]> Committed: Wed May 22 10:34:31 2013 -0400 ---------------------------------------------------------------------- .../META-INF/services/org.jclouds.apis.ApiMetadata | 17 ++++++++++++ openstack-glance/src/test/resources/logback.xml | 20 +++++++++++++++ .../META-INF/services/org.jclouds.apis.ApiMetadata | 17 ++++++++++++ .../v1_0/features/NetworkApiExpectTest.java | 4 +- .../quantum/v1_0/features/NetworkApiLiveTest.java | 4 +- .../quantum/v1_0/features/PortApiExpectTest.java | 4 +- .../quantum/v1_0/features/PortApiLiveTest.java | 4 +- openstack-quantum/src/test/resources/logback.xml | 20 +++++++++++++++ .../META-INF/services/org.jclouds.apis.ApiMetadata | 19 +++++++++++++- openstack-reddwarf/src/test/resources/logback.xml | 20 +++++++++++++++ .../jclouds/openstack/swift/v1/domain/Account.java | 19 ++++++++++++++ .../openstack/swift/v1/domain/Container.java | 19 ++++++++++++++ .../META-INF/services/org.jclouds.apis.ApiMetadata | 17 ++++++++++++ openstack-swift/src/test/resources/logback.xml | 20 +++++++++++++++ pom.xml | 1 - 15 files changed, 195 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata ---------------------------------------------------------------------- diff --git a/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata index c010366..75c695f 100644 --- a/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ b/openstack-glance/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata @@ -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. +# + org.jclouds.openstack.glance.v1_0.GlanceApiMetadata http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-glance/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/openstack-glance/src/test/resources/logback.xml b/openstack-glance/src/test/resources/logback.xml index a4f81d3..66af2b0 100644 --- a/openstack-glance/src/test/resources/logback.xml +++ b/openstack-glance/src/test/resources/logback.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + +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. + +--> <configuration scan="false"> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>target/test-data/jclouds.log</file> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata ---------------------------------------------------------------------- diff --git a/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata index ebd176c..044757f 100644 --- a/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ b/openstack-quantum/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata @@ -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. +# + org.jclouds.openstack.quantum.v1_0.QuantumApiMetadata http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java ---------------------------------------------------------------------- diff --git a/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java b/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java index d118747..84f411c 100644 --- a/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java +++ b/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiExpectTest.java @@ -3,11 +3,11 @@ * 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 1.1 (the + * 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-1.1 + * 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java b/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java index 5aa3957..5d4a3ab 100644 --- a/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java +++ b/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/NetworkApiLiveTest.java @@ -3,11 +3,11 @@ * 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 1.1 (the + * 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-1.1 + * 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java ---------------------------------------------------------------------- diff --git a/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java b/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java index 295757f..09c643c 100644 --- a/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java +++ b/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiExpectTest.java @@ -3,11 +3,11 @@ * 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 1.1 (the + * 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-1.1 + * 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java ---------------------------------------------------------------------- diff --git a/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java b/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java index a3b3b4e..477610d 100644 --- a/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java +++ b/openstack-quantum/src/test/java/org/jclouds/openstack/quantum/v1_0/features/PortApiLiveTest.java @@ -3,11 +3,11 @@ * 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 1.1 (the + * 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-1.1 + * 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-quantum/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/openstack-quantum/src/test/resources/logback.xml b/openstack-quantum/src/test/resources/logback.xml index a36c4c6..a34209c 100644 --- a/openstack-quantum/src/test/resources/logback.xml +++ b/openstack-quantum/src/test/resources/logback.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + +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. + +--> <configuration scan="false"> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>target/test-data/jclouds.log</file> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-reddwarf/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata ---------------------------------------------------------------------- diff --git a/openstack-reddwarf/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/openstack-reddwarf/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata index 1ec7be5..c267fd5 100644 --- a/openstack-reddwarf/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ b/openstack-reddwarf/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata @@ -1 +1,18 @@ -org.jclouds.openstack.reddwarf.v1.RedDwarfApiMetadata \ 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.openstack.reddwarf.v1.RedDwarfApiMetadata http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-reddwarf/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/openstack-reddwarf/src/test/resources/logback.xml b/openstack-reddwarf/src/test/resources/logback.xml index a36c4c6..a34209c 100644 --- a/openstack-reddwarf/src/test/resources/logback.xml +++ b/openstack-reddwarf/src/test/resources/logback.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + +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. + +--> <configuration scan="false"> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>target/test-data/jclouds.log</file> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java index db42896..73c4a8f 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.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.openstack.swift.v1.domain; import static com.google.common.base.Objects.equal; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java index ef459e6..8fcd59a 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.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.openstack.swift.v1.domain; import static com.google.common.base.Objects.equal; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata b/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata index 84f1200..c5b8017 100644 --- a/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata +++ b/openstack-swift/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata @@ -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. +# + org.jclouds.openstack.swift.v1.SwiftApiMetadata http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/openstack-swift/src/test/resources/logback.xml ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/resources/logback.xml b/openstack-swift/src/test/resources/logback.xml index a4f81d3..66af2b0 100644 --- a/openstack-swift/src/test/resources/logback.xml +++ b/openstack-swift/src/test/resources/logback.xml @@ -1,4 +1,24 @@ <?xml version="1.0"?> +<!-- + +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. + +--> <configuration scan="false"> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>target/test-data/jclouds.log</file> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/133ffc36/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 95e3dcc..6c4702b 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,6 @@ 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>
