Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F43418CC1 for ; Wed, 6 Apr 2016 08:45:20 +0000 (UTC) Received: (qmail 66496 invoked by uid 500); 6 Apr 2016 08:45:20 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 66413 invoked by uid 500); 6 Apr 2016 08:45:19 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 66399 invoked by uid 99); 6 Apr 2016 08:45:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2016 08:45:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B3F5AE0534; Wed, 6 Apr 2016 08:45:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Date: Wed, 06 Apr 2016 08:45:19 -0000 Message-Id: <6b1411f799f74cadbfe9f0b97f205909@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] hadoop git commit: HADOOP-12022. fix site -Pdocs -Pdist in hadoop-project-dist; cleanout remaining forrest bits. Contributed by Allen Wittenauer. Repository: hadoop Updated Branches: refs/heads/branch-2 8f9b97ccc -> 1371f993a http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/README.txt ---------------------------------------------------------------------- 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 9bc261b..0000000 --- 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/classes/CatalogManager.properties ---------------------------------------------------------------------- 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 b9cb584..0000000 --- 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= - http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/conf/cli.xconf ---------------------------------------------------------------------- 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 5c6e245..0000000 --- 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 - - - - - - - */* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/index.xml ---------------------------------------------------------------------- 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 e0df9c9..0000000 --- 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. -

- - -
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/site.xml ---------------------------------------------------------------------- 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 f9ce3be..0000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/site.xml +++ /dev/null @@ -1,263 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/tabs.xml ---------------------------------------------------------------------- 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 d2cccc1..0000000 --- a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/tabs.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/architecture.gif ---------------------------------------------------------------------- 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 8d84a23..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/architecture.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/common-logo.jpg ---------------------------------------------------------------------- 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 8ba52cd..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/common-logo.jpg and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/core-logo.gif ---------------------------------------------------------------------- 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 57879bb..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/core-logo.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/favicon.ico ---------------------------------------------------------------------- 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 161bcf7..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/favicon.ico and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo-big.jpg ---------------------------------------------------------------------- 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 0c6996c..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo-big.jpg and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo.jpg ---------------------------------------------------------------------- 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 809525d..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hadoop-logo.jpg and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.gif ---------------------------------------------------------------------- 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 7bbe150..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.odg ---------------------------------------------------------------------- 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 dae62bf..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.odg and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.png ---------------------------------------------------------------------- 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 70e434c..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsarchitecture.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.gif ---------------------------------------------------------------------- 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 b01f56f..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.gif and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.odg ---------------------------------------------------------------------- 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 e5d9227..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.odg and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.png ---------------------------------------------------------------------- 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 40ea2ec..0000000 Binary files a/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/resources/images/hdfsdatanodes.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/skinconf.xml ---------------------------------------------------------------------- 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 3c93d7f..0000000 --- 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 - - - - - - http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-common-project/hadoop-common/src/main/docs/status.xml ---------------------------------------------------------------------- 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 a820726..0000000 --- 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. - - - - - - http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-hdfs-project/hadoop-hdfs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 7100161..aa6dd27 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -372,7 +372,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/** @@ -385,7 +384,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> src/test/resources/editsStored* src/test/resources/empty-file 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/** http://git-wip-us.apache.org/repos/asf/hadoop/blob/1371f993/hadoop-project-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index 543d43e..5c7f039 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -246,28 +246,12 @@ - - - - -