From d488a594979d7777dcfc2d4beac75e1f7a5c13a3 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 12 Nov 2012 13:57:19 +0000 Subject: [PATCH] Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/site/apt/CLIMiniCluster.apt.vm | 0 .../src/site/apt/ClusterSetup.apt.vm | 0 .../src/site/apt/SingleCluster.apt.vm | 0 .../src/site/resources/css/site.css | 30 +++++++++++++++++ .../hadoop-common/src/site/site.xml | 28 ++++++++++++++++ .../src/site/resources/css/site.css | 30 +++++++++++++++++ .../src/site/apt/Federation.apt.vm | 0 .../src/site/apt/HDFSHighAvailability.apt.vm | 0 .../hadoop-hdfs}/src/site/apt/WebHDFS.apt.vm | 0 .../src/site/resources/css/site.css | 30 +++++++++++++++++ .../hadoop-hdfs/src/site/site.xml | 28 ++++++++++++++++ .../src/site/apt/EncryptedShuffle.apt.vm | 0 .../src/site/resources/css/site.css | 30 +++++++++++++++++ .../src/site/site.xml | 28 ++++++++++++++++ hadoop-project/src/site/apt/index.apt.vm | 6 ++-- hadoop-project/src/site/site.xml | 32 ++++++++++--------- .../src/site/apt/index.apt.vm | 4 +-- 17 files changed, 226 insertions(+), 20 deletions(-) rename {hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site => hadoop-common-project/hadoop-common}/src/site/apt/CLIMiniCluster.apt.vm (100%) rename {hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site => hadoop-common-project/hadoop-common}/src/site/apt/ClusterSetup.apt.vm (100%) rename {hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site => hadoop-common-project/hadoop-common}/src/site/apt/SingleCluster.apt.vm (100%) create mode 100644 hadoop-common-project/hadoop-common/src/site/resources/css/site.css create mode 100644 hadoop-common-project/hadoop-common/src/site/site.xml create mode 100644 hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/resources/css/site.css rename {hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site => hadoop-hdfs-project/hadoop-hdfs}/src/site/apt/Federation.apt.vm (100%) rename {hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site => hadoop-hdfs-project/hadoop-hdfs}/src/site/apt/HDFSHighAvailability.apt.vm (100%) rename {hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site => hadoop-hdfs-project/hadoop-hdfs}/src/site/apt/WebHDFS.apt.vm (100%) create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/site/resources/css/site.css create mode 100644 hadoop-hdfs-project/hadoop-hdfs/src/site/site.xml rename {hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site => hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core}/src/site/apt/EncryptedShuffle.apt.vm (100%) create mode 100644 hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/resources/css/site.css create mode 100644 hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/site.xml diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CLIMiniCluster.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/CLIMiniCluster.apt.vm similarity index 100% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CLIMiniCluster.apt.vm rename to hadoop-common-project/hadoop-common/src/site/apt/CLIMiniCluster.apt.vm diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm similarity index 100% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm rename to hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm similarity index 100% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm rename to hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm diff --git a/hadoop-common-project/hadoop-common/src/site/resources/css/site.css b/hadoop-common-project/hadoop-common/src/site/resources/css/site.css new file mode 100644 index 00000000000..f830baafa8c --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/site/resources/css/site.css @@ -0,0 +1,30 @@ +/* +* 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. +*/ +#banner { + height: 93px; + background: none; +} + +#bannerLeft img { + margin-left: 30px; + margin-top: 10px; +} + +#bannerRight img { + margin: 17px; +} + diff --git a/hadoop-common-project/hadoop-common/src/site/site.xml b/hadoop-common-project/hadoop-common/src/site/site.xml new file mode 100644 index 00000000000..1296cea12cf --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/site/site.xml @@ -0,0 +1,28 @@ + + + + + org.apache.maven.skins + maven-stylus-skin + 1.2 + + + + + + + + + diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/resources/css/site.css b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/resources/css/site.css new file mode 100644 index 00000000000..f830baafa8c --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/resources/css/site.css @@ -0,0 +1,30 @@ +/* +* 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. +*/ +#banner { + height: 93px; + background: none; +} + +#bannerLeft img { + margin-left: 30px; + margin-top: 10px; +} + +#bannerRight img { + margin: 17px; +} + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm similarity index 100% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm rename to hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HDFSHighAvailability.apt.vm b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailability.apt.vm similarity index 100% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HDFSHighAvailability.apt.vm rename to hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailability.apt.vm diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebHDFS.apt.vm b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm similarity index 100% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebHDFS.apt.vm rename to hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/resources/css/site.css b/hadoop-hdfs-project/hadoop-hdfs/src/site/resources/css/site.css new file mode 100644 index 00000000000..f830baafa8c --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/resources/css/site.css @@ -0,0 +1,30 @@ +/* +* 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. +*/ +#banner { + height: 93px; + background: none; +} + +#bannerLeft img { + margin-left: 30px; + margin-top: 10px; +} + +#bannerRight img { + margin: 17px; +} + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/site.xml b/hadoop-hdfs-project/hadoop-hdfs/src/site/site.xml new file mode 100644 index 00000000000..1296cea12cf --- /dev/null +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/site.xml @@ -0,0 +1,28 @@ + + + + + org.apache.maven.skins + maven-stylus-skin + 1.2 + + + + + + + + + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/EncryptedShuffle.apt.vm b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/EncryptedShuffle.apt.vm similarity index 100% rename from hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/EncryptedShuffle.apt.vm rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/apt/EncryptedShuffle.apt.vm diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/resources/css/site.css b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/resources/css/site.css new file mode 100644 index 00000000000..f830baafa8c --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/resources/css/site.css @@ -0,0 +1,30 @@ +/* +* 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. +*/ +#banner { + height: 93px; + background: none; +} + +#bannerLeft img { + margin-left: 30px; + margin-top: 10px; +} + +#bannerRight img { + margin: 17px; +} + diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/site.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/site.xml new file mode 100644 index 00000000000..1296cea12cf --- /dev/null +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/site.xml @@ -0,0 +1,28 @@ + + + + + org.apache.maven.skins + maven-stylus-skin + 1.2 + + + + + + + + + diff --git a/hadoop-project/src/site/apt/index.apt.vm b/hadoop-project/src/site/apt/index.apt.vm index 32e708ec542..aacae46da26 100644 --- a/hadoop-project/src/site/apt/index.apt.vm +++ b/hadoop-project/src/site/apt/index.apt.vm @@ -34,7 +34,7 @@ Apache Hadoop ${project.version} Namenodes. More details are available in the - {{{./hadoop-yarn/hadoop-yarn-site/Federation.html}HDFS Federation}} + {{{./hadoop-project-dist/hadoop-hdfs/Federation.html}HDFS Federation}} document. * {MapReduce NextGen aka YARN aka MRv2} @@ -65,9 +65,9 @@ Getting Started The Hadoop documentation includes the information you need to get started using Hadoop. Begin with the - {{{./hadoop-yarn/hadoop-yarn-site/SingleCluster.html}Single Node Setup}} which + {{{./hadoop-project-dist/hadoop-common/SingleCluster.html}Single Node Setup}} which shows you how to set up a single-node Hadoop installation. Then move on to the - {{{./hadoop-yarn/hadoop-yarn-site/ClusterSetup.html}Cluster Setup}} to learn how + {{{./hadoop-project-dist/hadoop-common/ClusterSetup.html}Cluster Setup}} to learn how to set up a multi-node Hadoop installation. diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml index f449b5d9b40..75dba8a924f 100644 --- a/hadoop-project/src/site/site.xml +++ b/hadoop-project/src/site/site.xml @@ -48,33 +48,35 @@ - - - - + + + + - - - + + + - - + + + + + - + - - + - + - + @@ -96,8 +98,8 @@ - + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm index badd9155509..7215172b7f1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/index.apt.vm @@ -49,7 +49,7 @@ MapReduce NextGen aka YARN aka MRv2 * {{{./WebApplicationProxy.html}Web Application Proxy}} - * {{{./CLIMiniCluster.html}CLI MiniCluster}} + * {{{../../hadoop-project-dist/hadoop-common/CLIMiniCluster.html}CLI MiniCluster}} - * {{{./EncryptedShuffle.html}Encrypted Shuffle}} + * {{{../../hadoop-mapreduce-client/hadoop-mapreduce-client-core/EncryptedShuffle.html}Encrypted Shuffle}}