Updated Branches: refs/heads/master c18f2d63a -> 0e663d406
CRUNCH-28: Add license headers. Configure Apache Rat to detect missing license headers. Add license headers to all files that didn't have them. Exclude test data and scrunch shell script for now. Signed-off-by: jwills <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/0e663d40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/0e663d40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/0e663d40 Branch: refs/heads/master Commit: 0e663d4063323a9743649848c06b0ea92cdeec5d Parents: c18f2d6 Author: Matthias Friedrich <[email protected]> Authored: Sun Jul 29 17:47:02 2012 +0200 Committer: jwills <[email protected]> Committed: Mon Jul 30 16:06:21 2012 -0700 ---------------------------------------------------------------------- .../org/apache/crunch/test/TemporaryPaths.java | 17 +++++++++ crunch/src/it/resources/log4j.properties | 16 ++++++++ crunch/src/main/resources/log4j.properties | 16 ++++++++ crunch/src/site/markdown/index.md | 18 +++++++++ .../java/org/apache/crunch/test/StringWrapper.java | 17 +++++++++ examples/src/main/assembly/hadoop-job.xml | 18 +++++++++ examples/src/site/markdown/index.md | 18 +++++++++ pom.xml | 28 +++++++++++++++ res/checkstyle.xml | 18 +++++++++ res/crunch-formatting-styles.xml | 18 +++++++++ scrunch/src/it/resources/log4j.properties | 16 ++++++++ scrunch/src/main/assembly/release.xml | 18 +++++++++ scrunch/src/main/conf/log4j.properties | 16 ++++++++ scrunch/src/main/scripts/scrunch-job.py | 15 ++++++++ scrunch/src/site/markdown/index.md | 18 +++++++++ src/site/markdown/index.md | 18 +++++++++ 16 files changed, 285 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/crunch/src/it/java/org/apache/crunch/test/TemporaryPaths.java ---------------------------------------------------------------------- diff --git a/crunch/src/it/java/org/apache/crunch/test/TemporaryPaths.java b/crunch/src/it/java/org/apache/crunch/test/TemporaryPaths.java index af8cf23..97cf0de 100644 --- a/crunch/src/it/java/org/apache/crunch/test/TemporaryPaths.java +++ b/crunch/src/it/java/org/apache/crunch/test/TemporaryPaths.java @@ -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. + */ package org.apache.crunch.test; import org.apache.crunch.impl.mr.run.RuntimeParameters; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/crunch/src/it/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/crunch/src/it/resources/log4j.properties b/crunch/src/it/resources/log4j.properties index c8173d7..a04cec8 100644 --- a/crunch/src/it/resources/log4j.properties +++ b/crunch/src/it/resources/log4j.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. + # ***** Set root logger level to INFO and its only appender to A. log4j.logger.org.apache.crunch=info, A http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/crunch/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/crunch/src/main/resources/log4j.properties b/crunch/src/main/resources/log4j.properties index dc08a07..506b527 100644 --- a/crunch/src/main/resources/log4j.properties +++ b/crunch/src/main/resources/log4j.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. + # ***** Set root logger level to INFO and its only appender to A. log4j.logger.org.apache.crunch=info, A http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/crunch/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/crunch/src/site/markdown/index.md b/crunch/src/site/markdown/index.md index 924dfc6..ad1d529 100644 --- a/crunch/src/site/markdown/index.md +++ b/crunch/src/site/markdown/index.md @@ -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. +--> # Crunch - Simple and Efficient Java Library for MapReduce Pipelines ## Introduction http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/crunch/src/test/java/org/apache/crunch/test/StringWrapper.java ---------------------------------------------------------------------- diff --git a/crunch/src/test/java/org/apache/crunch/test/StringWrapper.java b/crunch/src/test/java/org/apache/crunch/test/StringWrapper.java index 5b3c4c4..34302b5 100644 --- a/crunch/src/test/java/org/apache/crunch/test/StringWrapper.java +++ b/crunch/src/test/java/org/apache/crunch/test/StringWrapper.java @@ -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. + */ package org.apache.crunch.test; import org.apache.crunch.MapFn; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/examples/src/main/assembly/hadoop-job.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/assembly/hadoop-job.xml b/examples/src/main/assembly/hadoop-job.xml index a8d9a20..366bb33 100644 --- a/examples/src/main/assembly/hadoop-job.xml +++ b/examples/src/main/assembly/hadoop-job.xml @@ -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. +--> <assembly> <id>job</id> <formats> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/examples/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/examples/src/site/markdown/index.md b/examples/src/site/markdown/index.md index e69de29..2011a0f 100644 --- a/examples/src/site/markdown/index.md +++ b/examples/src/site/markdown/index.md @@ -0,0 +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. +--> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a0d7c0d..70b1569 100644 --- a/pom.xml +++ b/pom.xml @@ -323,6 +323,10 @@ under the License. <build> <plugins> <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <inherited>false</inherited> @@ -367,6 +371,30 @@ under the License. <pluginManagement> <plugins> <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.8</version> + <configuration> + <excludes> + <exclude>.git/**</exclude> + <exclude>.gitignore</exclude> + <exclude>.repository/</exclude> + <exclude>**/resources/*.txt</exclude> + <exclude>**/resources/*.avro</exclude> + <exclude>**/scripts/scrunch</exclude> <!-- FIXME! --> + </excludes> + </configuration> + <executions> + <execution> + <id>rat-check</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <version>2.5</version> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/res/checkstyle.xml ---------------------------------------------------------------------- diff --git a/res/checkstyle.xml b/res/checkstyle.xml index a8b741d..4c74367 100644 --- a/res/checkstyle.xml +++ b/res/checkstyle.xml @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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 module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> <module name="Checker"> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/res/crunch-formatting-styles.xml ---------------------------------------------------------------------- diff --git a/res/crunch-formatting-styles.xml b/res/crunch-formatting-styles.xml index 0f84a98..b8de08a 100644 --- a/res/crunch-formatting-styles.xml +++ b/res/crunch-formatting-styles.xml @@ -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. +--> <?xml version="1.0" encoding="UTF-8" standalone="no"?> <profiles version="11"> <profile kind="CodeFormatterProfile" name="crunch-style" version="11"> http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/scrunch/src/it/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/scrunch/src/it/resources/log4j.properties b/scrunch/src/it/resources/log4j.properties index 985a2eb..5016ed5 100644 --- a/scrunch/src/it/resources/log4j.properties +++ b/scrunch/src/it/resources/log4j.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. + # ***** Set root logger level to INFO and its only appender to A. log4j.logger.org.apache.crunch=info, A log4j.logger.org.apache.scrunch=info, A http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/scrunch/src/main/assembly/release.xml ---------------------------------------------------------------------- diff --git a/scrunch/src/main/assembly/release.xml b/scrunch/src/main/assembly/release.xml index 6d305de..e740f32 100644 --- a/scrunch/src/main/assembly/release.xml +++ b/scrunch/src/main/assembly/release.xml @@ -1,4 +1,22 @@ <!-- +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. +--> +<!-- Assembly configuration for the release bundle. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/scrunch/src/main/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/scrunch/src/main/conf/log4j.properties b/scrunch/src/main/conf/log4j.properties index 164ed56..448bb77 100644 --- a/scrunch/src/main/conf/log4j.properties +++ b/scrunch/src/main/conf/log4j.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. + # ***** Set root logger level to INFO and its only appender to A. log4j.logger.org.apache.scrunch=info, A http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/scrunch/src/main/scripts/scrunch-job.py ---------------------------------------------------------------------- diff --git a/scrunch/src/main/scripts/scrunch-job.py b/scrunch/src/main/scripts/scrunch-job.py index d50434c..2a61b3b 100755 --- a/scrunch/src/main/scripts/scrunch-job.py +++ b/scrunch/src/main/scripts/scrunch-job.py @@ -1,4 +1,19 @@ #!/usr/bin/python +# 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. import glob import os http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/scrunch/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/scrunch/src/site/markdown/index.md b/scrunch/src/site/markdown/index.md index 5cca15b..704dfcc 100644 --- a/scrunch/src/site/markdown/index.md +++ b/scrunch/src/site/markdown/index.md @@ -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. +--> ## Scrunch - A Scala Wrapper for Crunch ## Introduction http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/0e663d40/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 924dfc6..ad1d529 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -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. +--> # Crunch - Simple and Efficient Java Library for MapReduce Pipelines ## Introduction
