Home Explore Help
Register Sign In
liuzhangxing
/
hadoop
forked from apache/hadoop
1
0
Fork 0
Files
Browse Source

Merge -r 1411761:1411762 from trunk to branch-0.23.5. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.5@1411771 13f79535-47bb-0310-9956-ffa450edef68
Thomas White 12 years ago
parent
43edc5423f
commit
12444f2ea8
14 changed files with 220 additions and 15 deletions
Unified View Show Diff Stats
  1. 3 0
      hadoop-common-project/hadoop-common/CHANGES.txt
  2. 0 0
      hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
  3. 0 0
      hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm
  4. 30 0
      hadoop-common-project/hadoop-common/src/site/resources/css/site.css
  5. 28 0
      hadoop-common-project/hadoop-common/src/site/site.xml
  6. 30 0
      hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/resources/css/site.css
  7. 0 0
      hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm
  8. 0 0
      hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
  9. 30 0
      hadoop-hdfs-project/hadoop-hdfs/src/site/resources/css/site.css
  10. 28 0
      hadoop-hdfs-project/hadoop-hdfs/src/site/site.xml
  11. 30 0
      hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/resources/css/site.css
  12. 28 0
      hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/site.xml
  13. 3 3
      hadoop-project/src/site/apt/index.apt.vm
  14. 10 12
      hadoop-project/src/site/site.xml

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt
View File 

@@ -25,6 +25,9 @@ Release 0.23.5 - UNRELEASED
 
 
 
     HADOOP-8889. Upgrade to Surefire 2.12.3 (todd)
 
     HADOOP-8889. Upgrade to Surefire 2.12.3 (todd)
 
 
 
+    HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
 
+    (tomwhite)
 
+
 
   OPTIMIZATIONS
 
   OPTIMIZATIONS
 
 
 
     HADOOP-8819. Incorrectly & is used instead of && in some file system 
     HADOOP-8819. Incorrectly & is used instead of && in some file system

+ 0 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm → hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm
View File


+ 0 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm → hadoop-common-project/hadoop-common/src/site/apt/SingleCluster.apt.vm
View File


+ 30 - 0
hadoop-common-project/hadoop-common/src/site/resources/css/site.css
View File 

@@ -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;
 
+}
 
+

+ 28 - 0
hadoop-common-project/hadoop-common/src/site/site.xml
View File 

@@ -0,0 +1,28 @@
 
+<!--
 
+ Licensed 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. See accompanying LICENSE file.
 
+-->
 
+<project name="Apache Hadoop ${project.version}">
 
+
 
+  <skin>
 
+    <groupId>org.apache.maven.skins</groupId>
 
+    <artifactId>maven-stylus-skin</artifactId>
 
+    <version>1.2</version>
 
+  </skin>
 
+
 
+  <body>
 
+    <links>
 
+      <item name="Apache Hadoop" href="http://hadoop.apache.org/"/>
 
+    </links>
 
+  </body>
 
+
 
+</project>

+ 30 - 0
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/resources/css/site.css
View File 

@@ -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;
 
+}
 
+

+ 0 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/Federation.apt.vm → hadoop-hdfs-project/hadoop-hdfs/src/site/apt/Federation.apt.vm
View File


+ 0 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/WebHDFS.apt.vm → hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
View File


+ 30 - 0
hadoop-hdfs-project/hadoop-hdfs/src/site/resources/css/site.css
View File 

@@ -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;
 
+}
 
+

+ 28 - 0
hadoop-hdfs-project/hadoop-hdfs/src/site/site.xml
View File 

@@ -0,0 +1,28 @@
 
+<!--
 
+ Licensed 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. See accompanying LICENSE file.
 
+-->
 
+<project name="Apache Hadoop ${project.version}">
 
+
 
+  <skin>
 
+    <groupId>org.apache.maven.skins</groupId>
 
+    <artifactId>maven-stylus-skin</artifactId>
 
+    <version>1.2</version>
 
+  </skin>
 
+
 
+  <body>
 
+    <links>
 
+      <item name="Apache Hadoop" href="http://hadoop.apache.org/"/>
 
+    </links>
 
+  </body>
 
+
 
+</project>

+ 30 - 0
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/resources/css/site.css
View File 

@@ -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;
 
+}
 
+

+ 28 - 0
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/site.xml
View File 

@@ -0,0 +1,28 @@
 
+<!--
 
+ Licensed 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. See accompanying LICENSE file.
 
+-->
 
+<project name="Apache Hadoop ${project.version}">
 
+
 
+  <skin>
 
+    <groupId>org.apache.maven.skins</groupId>
 
+    <artifactId>maven-stylus-skin</artifactId>
 
+    <version>1.2</version>
 
+  </skin>
 
+
 
+  <body>
 
+    <links>
 
+      <item name="Apache Hadoop" href="http://hadoop.apache.org/"/>
 
+    </links>
 
+  </body>
 
+
 
+</project>

+ 3 - 3
hadoop-project/src/site/apt/index.apt.vm
View File 

@@ -34,7 +34,7 @@ Apache Hadoop 0.23
 
   Namenodes.
 
   Namenodes.
 
 
 
   More details are available in the 
   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.
 
   document.
 
 
 
   * {MapReduce NextGen aka YARN aka MRv2}
 
   * {MapReduce NextGen aka YARN aka MRv2}
 
@@ -65,9 +65,9 @@ Getting Started
 
 
 
   The Hadoop documentation includes the information you need to get started using
 
   The Hadoop documentation includes the information you need to get started using
 
   Hadoop. Begin with the
 
   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
 
   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.
 
   to set up a multi-node Hadoop installation.

+ 10 - 12
hadoop-project/src/site/site.xml
View File 

@@ -48,31 +48,29 @@
 
 
 
     <menu name="Common" inherit="top">
 
     <menu name="Common" inherit="top">
 
       <item name="Overview" href="index.html"/>
 
       <item name="Overview" href="index.html"/>
 
-      <item name="Single Node Setup" href="hadoop-yarn/hadoop-yarn-site/SingleCluster.html"/>
 
-      <item name="Cluster Setup" href="hadoop-yarn/hadoop-yarn-site/ClusterSetup.html"/>
 
-      <item name="Hadoop Commands" href="hadoop-project-dist/hadoop-common/commands_manual.html"/>
 
+      <item name="Single Node Setup" href="hadoop-project-dist/hadoop-common/SingleCluster.html"/>
 
+      <item name="Cluster Setup" href="hadoop-project-dist/hadoop-common/ClusterSetup.html"/>
 
     </menu>
 
     </menu>
 
     
     
     <menu name="HDFS" inherit="top">
 
     <menu name="HDFS" inherit="top">
 
-      <item name="Federation" href="hadoop-yarn/hadoop-yarn-site/Federation.html"/>
 
-      <item name="WebHDFS REST API" href="hadoop-yarn/hadoop-yarn-site/WebHDFS.html"/>
 
+      <item name="Federation" href="hadoop-project-dist/hadoop-hdfs/Federation.html"/>
 
+      <item name="WebHDFS REST API" href="hadoop-project-dist/hadoop-hdfs/WebHDFS.html"/>
 
       <item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/>
 
       <item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/>
 
-      <item name="HDFS User Guide" href="hadoop-project-dist/hadoop-hdfs/hdfs_user_guide.html"/>
 
     </menu>
 
     </menu>
 
 
 
-    <menu name="Yarn/MapReduce" inherit="top">
 
+    <menu name="MapReduce/YARN" inherit="top">
 
       <item name="YARN Architecture" href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
 
       <item name="YARN Architecture" href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
 
-      <item name="Writing Yarn Applications" href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>
 
+      <item name="Writing YARN Applications" href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>
 
       <item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
 
       <item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
 
       <item name="Web Application Proxy" href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
 
       <item name="Web Application Proxy" href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
 
-      <item name="Yarn Commands" href="hadoop-yarn/hadoop-yarn-site/YarnCommands.html"/>
 
+      <item name="YARN Commands" href="hadoop-yarn/hadoop-yarn-site/YarnCommands.html"/>
 
     </menu>
 
     </menu>
 
 
 
-    <menu name="YARN REST API's" inherit="top">
 
+    <menu name="YARN REST APIs" inherit="top">
 
       <item name="Introduction" href="hadoop-yarn/hadoop-yarn-site/WebServicesIntro.html"/>
 
       <item name="Introduction" href="hadoop-yarn/hadoop-yarn-site/WebServicesIntro.html"/>
 
       <item name="Resource Manager" href="hadoop-yarn/hadoop-yarn-site/ResourceManagerRest.html"/>
 
       <item name="Resource Manager" href="hadoop-yarn/hadoop-yarn-site/ResourceManagerRest.html"/>
 
       <item name="Node Manager" href="hadoop-yarn/hadoop-yarn-site/NodeManagerRest.html"/>
 
       <item name="Node Manager" href="hadoop-yarn/hadoop-yarn-site/NodeManagerRest.html"/>
 
-      <item name="Mapreduce Application Master" href="hadoop-yarn/hadoop-yarn-site/MapredAppMasterRest.html"/>
 
+      <item name="MR Application Master" href="hadoop-yarn/hadoop-yarn-site/MapredAppMasterRest.html"/>
 
       <item name="History Server" href="hadoop-yarn/hadoop-yarn-site/HistoryServerRest.html"/>
 
       <item name="History Server" href="hadoop-yarn/hadoop-yarn-site/HistoryServerRest.html"/>
 
     </menu>
 
     </menu>
 
     
     
@@ -94,8 +92,8 @@
 
     <menu name="Configuration" inherit="top">
 
     <menu name="Configuration" inherit="top">
 
       <item name="core-default.xml" href="hadoop-project-dist/hadoop-common/core-default.xml"/>
 
       <item name="core-default.xml" href="hadoop-project-dist/hadoop-common/core-default.xml"/>
 
       <item name="hdfs-default.xml" href="hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/>
 
       <item name="hdfs-default.xml" href="hadoop-project-dist/hadoop-hdfs/hdfs-default.xml"/>
 
-      <item name="yarn-default.xml" href="hadoop-yarn/hadoop-yarn-common/yarn-default.xml"/>
 
       <item name="mapred-default.xml" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml"/>
 
       <item name="mapred-default.xml" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml"/>
 
+      <item name="yarn-default.xml" href="hadoop-yarn/hadoop-yarn-common/yarn-default.xml"/>
 
       <item name="Deprecated Properties" href="hadoop-project-dist/hadoop-common/DeprecatedProperties.html"/>
 
       <item name="Deprecated Properties" href="hadoop-project-dist/hadoop-common/DeprecatedProperties.html"/>
 
     </menu>
 
     </menu>