HADOOP-12022. fix site -Pdocs -Pdist in hadoop-project-dist; cleanout remaining forrest bits. Contributed by Allen Wittenauer.
(cherry picked from commit 1371f993a9fa59d7e91321f022eab9974319d641) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e426d1bb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e426d1bb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e426d1bb Branch: refs/heads/branch-2.8 Commit: e426d1bb3f9ea448f65ddda861713c6aa1bcde18 Parents: b7c83d4 Author: Akira Ajisaka <aajis...@apache.org> Authored: Wed Apr 6 17:43:31 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Wed Apr 6 17:44:54 2016 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/pom.xml | 1 - .../src/main/docs/changes/ChangesFancyStyle.css | 170 - .../main/docs/changes/ChangesSimpleStyle.css | 49 - .../src/main/docs/changes/changes2html.pl | 282 - .../src/main/docs/releasenotes.html | 29174 ----------------- .../src/main/docs/src/documentation/README.txt | 7 - .../classes/CatalogManager.properties | 40 - .../main/docs/src/documentation/conf/cli.xconf | 327 - .../src/documentation/content/xdocs/index.xml | 48 - .../src/documentation/content/xdocs/site.xml | 263 - .../src/documentation/content/xdocs/tabs.xml | 37 - .../resources/images/architecture.gif | Bin 15461 -> 0 bytes .../resources/images/common-logo.jpg | Bin 5887 -> 0 bytes .../resources/images/core-logo.gif | Bin 6665 -> 0 bytes .../documentation/resources/images/favicon.ico | Bin 766 -> 0 bytes .../resources/images/hadoop-logo-big.jpg | Bin 127869 -> 0 bytes .../resources/images/hadoop-logo.jpg | Bin 9443 -> 0 bytes .../resources/images/hdfsarchitecture.gif | Bin 17653 -> 0 bytes .../resources/images/hdfsarchitecture.odg | Bin 41298 -> 0 bytes .../resources/images/hdfsarchitecture.png | Bin 40571 -> 0 bytes .../resources/images/hdfsdatanodes.gif | Bin 16060 -> 0 bytes .../resources/images/hdfsdatanodes.odg | Bin 37296 -> 0 bytes .../resources/images/hdfsdatanodes.png | Bin 30012 -> 0 bytes .../main/docs/src/documentation/skinconf.xml | 366 - .../hadoop-common/src/main/docs/status.xml | 75 - hadoop-hdfs-project/hadoop-hdfs/pom.xml | 2 - hadoop-project-dist/pom.xml | 16 - 27 files changed, 30857 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e426d1bb/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 6b4888f..d7a0a8b 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -475,7 +475,6 @@ <excludes> <exclude>.idea/**</exclude> <exclude>src/main/conf/*</exclude> - <exclude>src/main/docs/**</exclude> <exclude>dev-support/jdiff/**</exclude> <exclude>src/main/native/*</exclude> <exclude>src/main/native/config/*</exclude> http://git-wip-us.apache.org/repos/asf/hadoop/blob/e426d1bb/hadoop-common-project/hadoop-common/src/main/docs/changes/ChangesFancyStyle.css ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/docs/changes/ChangesFancyStyle.css b/hadoop-common-project/hadoop-common/src/main/docs/changes/ChangesFancyStyle.css deleted file mode 100644 index 5eef241..0000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/changes/ChangesFancyStyle.css +++ /dev/null @@ -1,170 +0,0 @@ -/* -* 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. -*/ -/** - * General - */ - -img { border: 0; } - -#content table { - border: 0; - width: 100%; -} -/*Hack to get IE to render the table at 100%*/ -* html #content table { margin-left: -3px; } - -#content th, -#content td { - margin: 0; - padding: 0; - vertical-align: top; -} - -.clearboth { - clear: both; -} - -.note, .warning, .fixme { - border: solid black 1px; - margin: 1em 3em; -} - -.note .label { - background: #369; - color: white; - font-weight: bold; - padding: 5px 10px; -} -.note .content { - background: #F0F0FF; - color: black; - line-height: 120%; - font-size: 90%; - padding: 5px 10px; -} -.warning .label { - background: #C00; - color: white; - font-weight: bold; - padding: 5px 10px; -} -.warning .content { - background: #FFF0F0; - color: black; - line-height: 120%; - font-size: 90%; - padding: 5px 10px; -} -.fixme .label { - background: #C6C600; - color: black; - font-weight: bold; - padding: 5px 10px; -} -.fixme .content { - padding: 5px 10px; -} - -/** - * Typography - */ - -body { - font-family: verdana, "Trebuchet MS", arial, helvetica, sans-serif; - font-size: 100%; -} - -#content { - font-family: Georgia, Palatino, Times, serif; - font-size: 95%; -} -#tabs { - font-size: 70%; -} -#menu { - font-size: 80%; -} -#footer { - font-size: 70%; -} - -h1, h2, h3, h4, h5, h6 { - font-family: "Trebuchet MS", verdana, arial, helvetica, sans-serif; - font-weight: bold; - margin-top: 1em; - margin-bottom: .5em; -} - -h1 { - margin-top: 0; - margin-bottom: 1em; - font-size: 1.4em; - background-color: 73CAFF -} -#content h1 { - font-size: 160%; - margin-bottom: .5em; -} -#menu h1 { - margin: 0; - padding: 10px; - background: #336699; - color: white; -} -h2 { - font-size: 120%; - background-color: 73CAFF -} -h3 { font-size: 100%; } -h4 { font-size: 90%; } -h5 { font-size: 80%; } -h6 { font-size: 75%; } - -p { - line-height: 120%; - text-align: left; - margin-top: .5em; - margin-bottom: 1em; -} - -#content li, -#content th, -#content td, -#content li ul, -#content li ol{ - margin-top: .5em; - margin-bottom: .5em; -} - - -#content li li, -#minitoc-area li{ - margin-top: 0em; - margin-bottom: 0em; -} - -#content .attribution { - text-align: right; - font-style: italic; - font-size: 85%; - margin-top: 1em; -} - -.codefrag { - font-family: "Courier New", Courier, monospace; - font-size: 110%; -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/e426d1bb/hadoop-common-project/hadoop-common/src/main/docs/changes/ChangesSimpleStyle.css ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/docs/changes/ChangesSimpleStyle.css b/hadoop-common-project/hadoop-common/src/main/docs/changes/ChangesSimpleStyle.css deleted file mode 100644 index 407d0f1..0000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/changes/ChangesSimpleStyle.css +++ /dev/null @@ -1,49 +0,0 @@ -/* -* 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. -*/ - -body { - font-family: Courier New, monospace; - font-size: 10pt; -} - -h1 { - font-family: Courier New, monospace; - font-size: 10pt; -} - -h2 { - font-family: Courier New, monospace; - font-size: 10pt; -} - -h3 { - font-family: Courier New, monospace; - font-size: 10pt; -} - -a:link { - color: blue; -} - -a:visited { - color: purple; -} - -li { - margin-top: 1em; - margin-bottom: 1em; -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/e426d1bb/hadoop-common-project/hadoop-common/src/main/docs/changes/changes2html.pl ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/docs/changes/changes2html.pl b/hadoop-common-project/hadoop-common/src/main/docs/changes/changes2html.pl deleted file mode 100755 index 67e1826..0000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/changes/changes2html.pl +++ /dev/null @@ -1,282 +0,0 @@ -#!/usr/bin/perl -# -# Transforms Lucene Java's CHANGES.txt into Changes.html -# -# Input is on STDIN, output is to STDOUT -# -# -# 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. -# - -use strict; -use warnings; - -my $jira_url_prefix = 'http://issues.apache.org/jira/browse/'; -my $title = undef; -my $release = undef; -my $sections = undef; -my $items = undef; -my $first_relid = undef; -my $second_relid = undef; -my @releases = (); - -my @lines = <>; # Get all input at once - -# -# Parse input and build hierarchical release structure in @releases -# -for (my $line_num = 0 ; $line_num <= $#lines ; ++$line_num) { - $_ = $lines[$line_num]; - next unless (/\S/); # Skip blank lines - - unless ($title) { - if (/\S/) { - s/^\s+//; # Trim leading whitespace - s/\s+$//; # Trim trailing whitespace - } - $title = $_; - next; - } - - if (/^(Release)|(Trunk)/) { # Release headings - $release = $_; - $sections = []; - push @releases, [ $release, $sections ]; - ($first_relid = lc($release)) =~ s/\s+/_/g if ($#releases == 0); - ($second_relid = lc($release)) =~ s/\s+/_/g if ($#releases == 1); - $items = undef; - next; - } - - # Section heading: 2 leading spaces, words all capitalized - if (/^ ([A-Z]+)\s*/) { - my $heading = $_; - $items = []; - push @$sections, [ $heading, $items ]; - next; - } - - # Handle earlier releases without sections - create a headless section - unless ($items) { - $items = []; - push @$sections, [ undef, $items ]; - } - - my $type; - if (@$items) { # A list item has been encountered in this section before - $type = $items->[0]; # 0th position of items array is list type - } else { - $type = get_list_type($_); - push @$items, $type; - } - - if ($type eq 'numbered') { # The modern items list style - # List item boundary is another numbered item or an unindented line - my $line; - my $item = $_; - $item =~ s/^(\s{0,2}\d+\.\s*)//; # Trim the leading item number - my $leading_ws_width = length($1); - $item =~ s/\s+$//; # Trim trailing whitespace - $item .= "\n"; - - while ($line_num < $#lines - and ($line = $lines[++$line_num]) !~ /^(?:\s{0,2}\d+\.\s*\S|\S)/) { - $line =~ s/^\s{$leading_ws_width}//; # Trim leading whitespace - $line =~ s/\s+$//; # Trim trailing whitespace - $item .= "$line\n"; - } - $item =~ s/\n+\Z/\n/; # Trim trailing blank lines - push @$items, $item; - --$line_num unless ($line_num == $#lines); - } elsif ($type eq 'paragraph') { # List item boundary is a blank line - my $line; - my $item = $_; - $item =~ s/^(\s+)//; - my $leading_ws_width = defined($1) ? length($1) : 0; - $item =~ s/\s+$//; # Trim trailing whitespace - $item .= "\n"; - - while ($line_num < $#lines and ($line = $lines[++$line_num]) =~ /\S/) { - $line =~ s/^\s{$leading_ws_width}//; # Trim leading whitespace - $line =~ s/\s+$//; # Trim trailing whitespace - $item .= "$line\n"; - } - push @$items, $item; - --$line_num unless ($line_num == $#lines); - } else { # $type is one of the bulleted types - # List item boundary is another bullet or a blank line - my $line; - my $item = $_; - $item =~ s/^(\s*$type\s*)//; # Trim the leading bullet - my $leading_ws_width = length($1); - $item =~ s/\s+$//; # Trim trailing whitespace - $item .= "\n"; - - while ($line_num < $#lines - and ($line = $lines[++$line_num]) !~ /^\s*(?:$type|\Z)/) { - $line =~ s/^\s{$leading_ws_width}//; # Trim leading whitespace - $line =~ s/\s+$//; # Trim trailing whitespace - $item .= "$line\n"; - } - push @$items, $item; - --$line_num unless ($line_num == $#lines); - } -} - -# -# Print HTML-ified version to STDOUT -# -print<<"__HTML_HEADER__"; -<!-- -********************************************************** -** WARNING: This file is generated from CHANGES.txt by the -** Perl script 'changes2html.pl'. -** Do *not* edit this 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. -**************************************************************************** ---> -<html> -<head> - <title>$title</title> - <link rel="stylesheet" href="ChangesFancyStyle.css" title="Fancy"> - <link rel="alternate stylesheet" href="ChangesSimpleStyle.css" title="Simple"> - <META http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <SCRIPT> - function toggleList(e) { - element = document.getElementById(e).style; - element.display == 'none' ? element.display = 'block' : element.display='none'; - } - function collapse() { - for (var i = 0; i < document.getElementsByTagName("ul").length; i++) { - var list = document.getElementsByTagName("ul")[i]; - if (list.id != '$first_relid' && list.id != '$second_relid') { - list.style.display = "none"; - } - } - for (var i = 0; i < document.getElementsByTagName("ol").length; i++) { - document.getElementsByTagName("ol")[i].style.display = "none"; - } - } - window.onload = collapse; - </SCRIPT> -</head> -<body> - -<a href="http://hadoop.apache.org/core/"><img class="logoImage" alt="Hadoop" src="images/hadoop-logo.jpg" title="Scalable Computing Platform"></a> -<h1>$title</h1> - -__HTML_HEADER__ - -my $heading; -my $relcnt = 0; -my $header = 'h2'; -for my $rel (@releases) { - if (++$relcnt == 3) { - $header = 'h3'; - print "<h2><a href=\"javascript:toggleList('older')\">"; - print "Older Releases"; - print "</a></h2>\n"; - print "<ul id=\"older\">\n" - } - - ($release, $sections) = @$rel; - - # The first section heading is undefined for the older sectionless releases - my $has_release_sections = $sections->[0][0]; - - (my $relid = lc($release)) =~ s/\s+/_/g; - print "<$header><a href=\"javascript:toggleList('$relid')\">"; - print "$release"; - print "</a></$header>\n"; - print "<ul id=\"$relid\">\n" - if ($has_release_sections); - - for my $section (@$sections) { - ($heading, $items) = @$section; - (my $sectid = lc($heading)) =~ s/\s+/_/g; - my $numItemsStr = $#{$items} > 0 ? "($#{$items})" : "(none)"; - - print " <li><a href=\"javascript:toggleList('$relid.$sectid')\">", - ($heading || ''), "</a> $numItemsStr\n" - if ($has_release_sections); - - my $list_type = $items->[0] || ''; - my $list = ($has_release_sections || $list_type eq 'numbered' ? 'ol' : 'ul'); - my $listid = $sectid ? "$relid.$sectid" : $relid; - print " <$list id=\"$listid\">\n"; - - for my $itemnum (1..$#{$items}) { - my $item = $items->[$itemnum]; - $item =~ s:&:&:g; # Escape HTML metachars - $item =~ s:<:<:g; - $item =~ s:>:>:g; - - $item =~ s:\s*(\([^)"]+?\))\s*$:<br />$1:; # Separate attribution - $item =~ s:\n{2,}:\n<p/>\n:g; # Keep paragraph breaks - $item =~ s{(?:${jira_url_prefix})?(HADOOP-\d+)} # Link to JIRA - {<a href="${jira_url_prefix}$1">$1</a>}g; - print " <li>$item</li>\n"; - } - print " </$list>\n"; - print " </li>\n" if ($has_release_sections); - } - print "</ul>\n" if ($has_release_sections); -} -print "</ul>\n" if ($relcnt > 3); -print "</body>\n</html>\n"; - - -# -# Subroutine: get_list_type -# -# Takes one parameter: -# -# - The first line of a sub-section/point -# -# Returns one scalar: -# -# - The list type: 'numbered'; or one of the bulleted types '-', or '.' or -# 'paragraph'. -# -sub get_list_type { - my $first_list_item_line = shift; - my $type = 'paragraph'; # Default to paragraph type - - if ($first_list_item_line =~ /^\s{0,2}\d+\.\s+\S+/) { - $type = 'numbered'; - } elsif ($first_list_item_line =~ /^\s*([-.])\s+\S+/) { - $type = $1; - } - return $type; -} - -1;