diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index aba9087663..71b71a0a9b 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -477,6 +477,9 @@ Trunk (Unreleased) HADOOP-11983. HADOOP_USER_CLASSPATH_FIRST works the opposite of what it is supposed to do (Sangjin Lee via aw) + HADOOP-12022. fix site -Pdocs -Pdist in hadoop-project-dist; cleanout + remaining forrest bits (aw) + OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 6f9ecf7a3a..3043889af8 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -488,7 +488,6 @@ CHANGES.txt .idea/** src/main/conf/* - src/main/docs/** dev-support/jdiff/** src/main/native/* src/main/native/config/* 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 5eef2412b6..0000000000 --- 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%; -} 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 407d0f1cf6..0000000000 --- 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; -} 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 4431e57e00..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/changes/changes2html.pl +++ /dev/null @@ -1,286 +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__"; - - - - $title - - - - - - - -Hadoop -

$title

- -__HTML_HEADER__ - -my $heading; -my $relcnt = 0; -my $header = 'h2'; -for my $rel (@releases) { - if (++$relcnt == 3) { - $header = 'h3'; - print "

"; - print "Older Releases"; - print "

\n"; - print "\n" if ($relcnt > 3); -print "\n\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; diff --git a/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html b/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html deleted file mode 100644 index 988027219f..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/releasenotes.html +++ /dev/null @@ -1,29099 +0,0 @@ - -Hadoop 2.6.0 Release Notes - - - -

Hadoop 2.6.0 Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.5.1

- - - -Hadoop 2.4.1 Release Notes - - - -

Hadoop 2.4.1 Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.4.0

- - - -Hadoop 2.4.0 Release Notes - - - -

Hadoop 2.4.0 Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.3.0

- - - -Hadoop 2.3.0 Release Notes - - - -

Hadoop 2.3.0 Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.2.0

- - - - -Hadoop 2.2.0 Release Notes - - - -

Hadoop 2.2.0 Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.1.1-beta

- - - -Hadoop 2.1.1-beta Release Notes - - - -

Hadoop 2.1.1-beta Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.1.0-beta

- - - -Hadoop 2.1.0-beta Release Notes - - - -

Hadoop 2.1.0-beta Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.0.5-alpha

- - - -Hadoop 2.0.5-alpha Release Notes - - - -

Hadoop 2.0.5-alpha Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.0.4-alpha

- - - -Hadoop 2.0.4-alpha Release Notes - - - -

Hadoop 2.0.4-alpha Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.0.3-alpha

- - - -Hadoop 2.0.3-alpha Release Notes - - - -

Hadoop 2.0.3-alpha Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.0.2

- - - -Hadoop 2.0.2-alpha Release Notes - - - -

Hadoop 2.0.2-alpha Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.0.1-alpha

- - - -Hadoop 2.0.1-alpha Release Notes - - - -

Hadoop 2.0.1-alpha Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 2.0.0-alpha

- - - -Hadoop 2.0.0-alpha Release Notes - - - -

Hadoop 2.0.0-alpha Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 0.23.2

- - - -Hadoop 0.23.2 Release Notes - - - -

Hadoop 0.23.2 Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 0.23.1

- - - -Hadoop 0.23.1 Release Notes - - - -

Hadoop 0.23.1 Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 0.23.0

- - - -Hadoop 0.23.0 Release Notes - - - -

Hadoop 0.23.0 Release Notes

-These release notes include new developer and user-facing incompatibilities, features, and major improvements. - -

Changes since Hadoop 1.0.0

- - diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/README.txt b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/README.txt deleted file mode 100644 index 9bc261b2f1..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -This is the base documentation directory. - -skinconf.xml # This file customizes Forrest for your project. In it, you - # tell forrest the project name, logo, copyright info, etc - -sitemap.xmap # Optional. This sitemap is consulted before all core sitemaps. - # See http://forrest.apache.org/docs/project-sitemap.html diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/classes/CatalogManager.properties b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/classes/CatalogManager.properties deleted file mode 100644 index b9cb5848fb..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/classes/CatalogManager.properties +++ /dev/null @@ -1,40 +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. -# - -#======================================================================= -# CatalogManager.properties -# -# This is the default properties file for Apache Forrest. -# This facilitates local configuration of application-specific catalogs. -# -# See the Apache Forrest documentation: -# http://forrest.apache.org/docs/your-project.html -# http://forrest.apache.org/docs/validation.html - -# verbosity ... level of messages for status/debug -# See forrest/src/core/context/WEB-INF/cocoon.xconf - -# catalogs ... list of additional catalogs to load -# (Note that Apache Forrest will automatically load its own default catalog -# from src/core/context/resources/schema/catalog.xcat) -# use full pathnames -# pathname separator is always semi-colon (;) regardless of operating system -# directory separator is always slash (/) regardless of operating system -# -#catalogs=/home/me/forrest/my-site/src/documentation/resources/schema/catalog.xcat -catalogs= - diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/conf/cli.xconf b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/conf/cli.xconf deleted file mode 100644 index 5c6e245688..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/conf/cli.xconf +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - . - WEB-INF/cocoon.xconf - ../tmp/cocoon-work - ../site - - - - - - - - - - - - - - - index.html - - - - - - - */* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/index.xml b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/index.xml deleted file mode 100644 index e0df9c9168..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/index.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - -
- Overview -
- - -

-The Hadoop Common Documentation describes the common utilities and libraries that support the other Hadoop subprojects. -

-

-The Hadoop Common Documentation also includes the information you need to get started using Hadoop. -Begin with the Hadoop Single Node Setup which shows you how to set up a single-node Hadoop installation. -Then move on to the Hadoop Cluster Setup to learn how to set up a multi-node Hadoop installation. -

-

- Cluster environments commonly work in tandem with MapReduce applications and distributed file systems. - For information about MapReduce see the - MapReduce Documentation. - For information about the Hadoop Distributed File System (HDFS) see the - HDFS Documentation. -

-

-If you have more questions, you can ask on the Hadoop Common Mailing Lists or browse the Mailing List Archives. -

- - - diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/site.xml b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/site.xml deleted file mode 100644 index f9ce3becf0..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/site.xml +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/tabs.xml b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/tabs.xml deleted file mode 100644 index ffd556c2f2..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/tabs.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/architecture.gif b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/architecture.gif deleted file mode 100644 index 8d84a23b07..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/architecture.gif and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/common-logo.jpg b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/common-logo.jpg deleted file mode 100644 index 8ba52cd091..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/common-logo.jpg and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/core-logo.gif b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/core-logo.gif deleted file mode 100644 index 57879bb6dd..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/core-logo.gif and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/favicon.ico b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/favicon.ico deleted file mode 100644 index 161bcf7841..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/favicon.ico and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo-big.jpg b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo-big.jpg deleted file mode 100644 index 0c6996cdcb..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo-big.jpg and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo.jpg b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo.jpg deleted file mode 100644 index 809525d9f1..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo.jpg and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.gif b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.gif deleted file mode 100644 index 7bbe150dac..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.gif and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.odg b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.odg deleted file mode 100644 index dae62bfa75..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.odg and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.png b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.png deleted file mode 100644 index 70e434c1dc..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.png and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.gif b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.gif deleted file mode 100644 index b01f56fe2e..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.gif and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.odg b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.odg deleted file mode 100644 index e5d9227571..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.odg and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.png b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.png deleted file mode 100644 index 40ea2ec9d1..0000000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.png and /dev/null differ diff --git a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/skinconf.xml b/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/skinconf.xml deleted file mode 100644 index 3c93d7ff4e..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/skinconf.xml +++ /dev/null @@ -1,366 +0,0 @@ - - - - - - - - - - - - true - - false - - true - - true - - - true - - - true - - - true - - - false - - - true - - - Hadoop - Scalable Computing Platform - http://hadoop.apache.org/core/ - images/common-logo.jpg - - - Hadoop - Apache Hadoop - http://hadoop.apache.org/ - images/hadoop-logo.jpg - - - - - - - images/favicon.ico - - - 2009 - The Apache Software Foundation. - http://www.apache.org/licenses/ - - - - - - - - - - - - - - - - - - - p.quote { - margin-left: 2em; - padding: .5em; - background-color: #f0f0f0; - font-family: monospace; - } - - - #content h1 { - margin-bottom: .5em; - font-size: 185%; color: black; - font-family: arial; - } - h2, .h3 { font-size: 175%; color: black; font-family: arial; } - h3, .h4 { font-size: 135%; color: black; font-family: arial; margin-bottom: 0.5em; } - h4, .h5 { font-size: 125%; color: black; font-style: italic; font-weight: bold; font-family: arial; } - h5, h6 { font-size: 110%; color: #363636; font-weight: bold; } - - - pre.code { - margin-left: 0em; - padding: 0.5em; - background-color: rgb(241,239,231); - font-family: monospace; - } - - - - - - - - - - - - - - - - - - - - - - - - - - 1in - 1in - 1.25in - 1in - - - - false - - - false - - - - - - Built with Apache Forrest - http://forrest.apache.org/ - images/built-with-forrest-button.png - 88 - 31 - - - - - - diff --git a/hadoop-common-project/hadoop-common/src/main/docs/status.xml b/hadoop-common-project/hadoop-common/src/main/docs/status.xml deleted file mode 100644 index a8207267e5..0000000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/status.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - Initial Import - - - - - - - - - Customize this template project with your project's details. This - TODO list is generated from 'status.xml'. - - - Add lots of content. XML content goes in - src/documentation/content/xdocs, or wherever the - ${project.xdocs-dir} property (set in - forrest.properties) points. - - - Mail forrest-dev@xml.apache.org - with feedback. - - - - - - diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 34338d1e59..3eeadb65b5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -373,7 +373,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> .gitattributes .idea/** src/main/conf/* - src/main/docs/** dev-support/findbugsExcludeFile.xml dev-support/checkstyle* dev-support/jdiff/** @@ -390,7 +389,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> src/main/native/util/tree.h src/test/aop/org/apache/hadoop/hdfs/server/datanode/DataXceiverAspects.aj src/main/webapps/datanode/robots.txt - src/main/docs/releasenotes.html src/contrib/** src/site/resources/images/* src/main/webapps/static/bootstrap-3.0.2/** diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index c26aa9aa33..e712910ad3 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -246,28 +246,12 @@ - - - - -