You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/06/13 01:44:17 UTC
[1/2] git commit: Add license headers to src/test/resources where
possible, more fine-grained RAT exclusions
Updated Branches:
refs/heads/1.6.x 5c18b6a1b -> b5de0e6b8
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/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/a02218e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/a02218e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/a02218e2
Branch: refs/heads/1.6.x
Commit: a02218e2127d4cd8b2a291a98fa2dc5c235a1e6b
Parents: 5c18b6a
Author: Andrew Bayer <an...@gmail.com>
Authored: Mon Jun 10 11:45:58 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Mon Jun 10 11:45:58 2013 -0700
----------------------------------------------------------------------
apis/byon/src/test/resources/test1.yaml | 18 ++++++++++
apis/byon/src/test/resources/test_location.yaml | 18 ++++++++++
apis/byon/src/test/resources/test_with_url.yaml | 18 ++++++++++
.../src/test/resources/logging.properties | 37 +++++++++++++++-----
.../src/test/resources/errorpage.html | 21 +++++++++++
.../jclouds-core/pom.properties | 21 +++++++++++
project/pom.xml | 21 +++++++----
7 files changed, 140 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/a02218e2/apis/byon/src/test/resources/test1.yaml
----------------------------------------------------------------------
diff --git a/apis/byon/src/test/resources/test1.yaml b/apis/byon/src/test/resources/test1.yaml
index 97761f6..f3f5209 100644
--- a/apis/byon/src/test/resources/test1.yaml
+++ b/apis/byon/src/test/resources/test1.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.
+#
nodes:
- id: cluster-1
name: cluster-1
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/a02218e2/apis/byon/src/test/resources/test_location.yaml
----------------------------------------------------------------------
diff --git a/apis/byon/src/test/resources/test_location.yaml b/apis/byon/src/test/resources/test_location.yaml
index e5c4b59..09ba45a 100644
--- a/apis/byon/src/test/resources/test_location.yaml
+++ b/apis/byon/src/test/resources/test_location.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.
+#
nodes:
- id: cluster-1
name: cluster-1
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/a02218e2/apis/byon/src/test/resources/test_with_url.yaml
----------------------------------------------------------------------
diff --git a/apis/byon/src/test/resources/test_with_url.yaml b/apis/byon/src/test/resources/test_with_url.yaml
index ad348e6..54d9047 100644
--- a/apis/byon/src/test/resources/test_with_url.yaml
+++ b/apis/byon/src/test/resources/test_with_url.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.
+#
nodes:
- id: cluster-1
name: cluster-1
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/a02218e2/apis/filesystem/src/test/resources/logging.properties
----------------------------------------------------------------------
diff --git a/apis/filesystem/src/test/resources/logging.properties b/apis/filesystem/src/test/resources/logging.properties
index f78dbde..2b76983 100644
--- a/apis/filesystem/src/test/resources/logging.properties
+++ b/apis/filesystem/src/test/resources/logging.properties
@@ -1,8 +1,29 @@
-# Set the default logging level for all loggers to WARNING
-.level = INFO
-
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-org.jclouds.filesystem.FilesystemAsyncBlobStore.level=ALL
-org.jclouds.filesystem.FilesystemAsyncBlobStore.handler=java.util.logging.ConsoleHandler
+#
+#
+# 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.
+#
+#
+
+# Set the default logging level for all loggers to WARNING
+.level = INFO
+
+handlers = java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level = ALL
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+org.jclouds.filesystem.FilesystemAsyncBlobStore.level=ALL
+org.jclouds.filesystem.FilesystemAsyncBlobStore.handler=java.util.logging.ConsoleHandler
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/a02218e2/apis/rackspace-cloudloadbalancers/src/test/resources/errorpage.html
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/test/resources/errorpage.html b/apis/rackspace-cloudloadbalancers/src/test/resources/errorpage.html
index 7714e2f..1cda45e 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/resources/errorpage.html
+++ b/apis/rackspace-cloudloadbalancers/src/test/resources/errorpage.html
@@ -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.
+
+-->
+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
<head>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/a02218e2/core/src/test/resources/META-INF/maven/org.apache.jclouds/jclouds-core/pom.properties
----------------------------------------------------------------------
diff --git a/core/src/test/resources/META-INF/maven/org.apache.jclouds/jclouds-core/pom.properties b/core/src/test/resources/META-INF/maven/org.apache.jclouds/jclouds-core/pom.properties
index 29bd356..131ca6a 100644
--- a/core/src/test/resources/META-INF/maven/org.apache.jclouds/jclouds-core/pom.properties
+++ b/core/src/test/resources/META-INF/maven/org.apache.jclouds/jclouds-core/pom.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.
+#
+#
+
# Dummy pom.properties file for testing
version=0.0.0-SNAPSHOT
groupId=org.apache.jclouds
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/a02218e2/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index f93487a..596b51d 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -367,7 +367,17 @@
<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>
+
+ <!-- META-INF/services files -->
+ <exclude>**/services/*LoggingModule</exclude>
+ <exclude>**/services/*ApiMetadata</exclude>
+ <exclude>**/services/*ProviderMetadata</exclude>
<!-- prevent duplicating license -->
<exclude>**/LICENSE.txt</exclude>
@@ -385,10 +395,9 @@
<exclude>**/*json</exclude>
<exclude>**/*readme</exclude>
- <!-- one-line service registry files -->
- <exclude>**/*ProviderMetadata</exclude>
- <exclude>**/*ApiMetadata</exclude>
- <exclude>**/*LoggingModule</exclude>
+ <!-- SSH keys -->
+ <exclude>**/test</exclude>
+ <exclude>**/test.pub</exclude>
<!-- temporary files or those generated by IDE or SCM -->
<exclude>**/target/**</exclude>
@@ -778,7 +787,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
[2/2] git commit: Adding DEPENDENCIES to rat exclude
Posted by ab...@apache.org.
Adding DEPENDENCIES to rat exclude
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/b5de0e6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/b5de0e6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/b5de0e6b
Branch: refs/heads/1.6.x
Commit: b5de0e6b8c1345af939f8a8ababe55011460207c
Parents: a02218e
Author: Andrew Bayer <an...@gmail.com>
Authored: Tue Jun 11 09:24:19 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Tue Jun 11 09:24:19 2013 -0700
----------------------------------------------------------------------
project/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/b5de0e6b/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 596b51d..04ca4e0 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -390,6 +390,7 @@
<exclude>**/CHANGES.txt</exclude>
<exclude>**/README.md</exclude>
<exclude>**/README.txt</exclude>
+ <exclude>**/DEPENDENCIES</exclude>
<!-- reference data lists -->
<exclude>**/*json</exclude>