首页 发现 帮助
注册 登录
apache
/
hadoop
镜像自地址 https://github.com/apache/hadoop.git
2
0
派生 1
文件 工单管理 0 Wiki
浏览代码

HADOOP-7763. Add top-level navigation to APT docs.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1190703 13f79535-47bb-0310-9956-ffa450edef68
Thomas White 13 年之前
父节点
c8ac31e9a0
当前提交
cd77a1668f
共有 15 个文件被更改，包括 812 次插入 和 18 次删除
合并视图 显示文件统计
  1. 30 0
      hadoop-common-project/hadoop-auth/src/site/resources/css/site.css
  2. 1 7
      hadoop-common-project/hadoop-auth/src/site/site.xml
  3. 2 0
      hadoop-common-project/hadoop-common/CHANGES.txt
  4. 12 0
      hadoop-common-project/hadoop-common/pom.xml
  5. 544 0
      hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
  6. 12 0
      hadoop-hdfs-project/hadoop-hdfs/pom.xml
  7. 18 0
      hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
  8. 30 0
      hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/resources/css/site.css
  9. 1 7
      hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml
  10. 0 1
      hadoop-mapreduce-project/hadoop-yarn/pom.xml
  11. 1 1
      hadoop-project/pom.xml
  12. 29 0
      hadoop-project/src/site/apt/index.apt.vm
  13. 30 0
      hadoop-project/src/site/resources/css/site.css
  14. 80 0
      hadoop-project/src/site/site.xml
  15. 22 2
      pom.xml

+ 30 - 0
hadoop-common-project/hadoop-auth/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;
 
+}
 
+

+ 1 - 7
hadoop-common-project/hadoop-auth/src/site/site.xml
查看文件 

@@ -13,16 +13,10 @@
 
 -->
 
 -->
 
 <project name="Hadoop Auth">
 
 <project name="Hadoop Auth">
 
 
 
-  <version position="right"/>
 
-
 
-  <bannerLeft>
 
-    <name>&nbsp;</name>
 
-  </bannerLeft>
 
-
 
   <skin>
 
   <skin>
 
     <groupId>org.apache.maven.skins</groupId>
 
     <groupId>org.apache.maven.skins</groupId>
 
     <artifactId>maven-stylus-skin</artifactId>
 
     <artifactId>maven-stylus-skin</artifactId>
 
-    <version>1.1</version>
 
+    <version>1.2</version>
 
   </skin>
 
   </skin>
 
 
 
   <body>
 
   <body>

+ 2 - 0
hadoop-common-project/hadoop-common/CHANGES.txt
查看文件 

@@ -523,6 +523,8 @@ Release 0.23.0 - Unreleased
 
     HADOOP-7446. Implement CRC32C native code using SSE4.2 instructions.
 
     HADOOP-7446. Implement CRC32C native code using SSE4.2 instructions.
 
     (Kihwal Lee and todd via todd)
 
     (Kihwal Lee and todd via todd)
 
 
 
+    HADOOP-7763. Add top-level navigation to APT docs. (tomwhite)
 
+
 
   BUG FIXES
 
   BUG FIXES
 
 
 
     HADOOP-7740. Fixed security audit logger configuration. (Arpit Gupta via Eric Yang)
 
     HADOOP-7740. Fixed security audit logger configuration. (Arpit Gupta via Eric Yang)

+ 12 - 0
hadoop-common-project/hadoop-common/pom.xml
查看文件 

@@ -347,6 +347,18 @@
 
               </target>
 
               </target>
 
             </configuration>
 
             </configuration>
 
           </execution>
 
           </execution>
 
+          <execution>
 
+            <phase>pre-site</phase>
 
+            <goals>
 
+              <goal>run</goal>
 
+            </goals>
 
+            <configuration>
 
+              <tasks>
 
+                <copy file="src/main/resources/core-default.xml" todir="src/site/resources"/>
 
+                <copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
 
+              </tasks>
 
+            </configuration>
 
+          </execution>
 
         </executions>
 
         </executions>
 
       </plugin>
 
       </plugin>
 
       <plugin>
 
       <plugin>

+ 544 - 0
hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
查看文件 

@@ -0,0 +1,544 @@
 
+~~ 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.
 
+
 
+  ---
 
+  Hadoop ${project.version}
 
+  ---
 
+  ---
 
+  ${maven.build.timestamp}
 
+  
+Deprecated Properties
 
+
 
+  The following table lists the configuration property names that are
 
+  deprecated in this version of Hadoop, and their replacements.
 
+
 
+*-------------------------------+-----------------------+
 
+|| <<Deprecated property name>> || <<New property name>>|
 
+*-------------------------------+-----------------------+
 
+|StorageId | dfs.datanode.StorageId
 
+*---+---+
 
+|create.empty.dir.if.nonexist | mapreduce.jobcontrol.createdir.ifnotexist
 
+*---+---+
 
+|dfs.access.time.precision | dfs.namenode.accesstime.precision
 
+*---+---+
 
+|dfs.backup.address | dfs.namenode.backup.address
 
+*---+---+
 
+|dfs.backup.http.address | dfs.namenode.backup.http-address
 
+*---+---+
 
+|dfs.balance.bandwidthPerSec | dfs.datanode.balance.bandwidthPerSec
 
+*---+---+
 
+|dfs.block.size | dfs.blocksize
 
+*---+---+
 
+|dfs.client.buffer.dir | fs.client.buffer.dir
 
+*---+---+
 
+|dfs.data.dir | dfs.datanode.data.dir
 
+*---+---+
 
+|dfs.datanode.max.xcievers | dfs.datanode.max.transfer.threads
 
+*---+---+
 
+|dfs.df.interval | fs.df.interval
 
+*---+---+
 
+|dfs.http.address | dfs.namenode.http-address
 
+*---+---+
 
+|dfs.https.address | dfs.namenode.https-address
 
+*---+---+
 
+|dfs.https.client.keystore.resource | dfs.client.https.keystore.resource
 
+*---+---+
 
+|dfs.https.need.client.auth | dfs.client.https.need-auth
 
+*---+---+
 
+|dfs.max-repl-streams | dfs.namenode.replication.max-streams
 
+*---+---+
 
+|dfs.max.objects | dfs.namenode.max.objects
 
+*---+---+
 
+|dfs.name.dir | dfs.namenode.name.dir
 
+*---+---+
 
+|dfs.name.dir.restore | dfs.namenode.name.dir.restore
 
+*---+---+
 
+|dfs.name.edits.dir | dfs.namenode.edits.dir
 
+*---+---+
 
+|dfs.permissions | dfs.permissions.enabled
 
+*---+---+
 
+|dfs.permissions.supergroup | dfs.permissions.superusergroup
 
+*---+---+
 
+|dfs.read.prefetch.size | dfs.client.read.prefetch.size
 
+*---+---+
 
+|dfs.replication.considerLoad | dfs.namenode.replication.considerLoad
 
+*---+---+
 
+|dfs.replication.interval | dfs.namenode.replication.interval
 
+*---+---+
 
+|dfs.replication.min | dfs.namenode.replication.min
 
+*---+---+
 
+|dfs.replication.pending.timeout.sec | dfs.namenode.replication.pending.timeout-sec
 
+*---+---+
 
+|dfs.safemode.extension | dfs.namenode.safemode.extension
 
+*---+---+
 
+|dfs.safemode.threshold.pct | dfs.namenode.safemode.threshold-pct
 
+*---+---+
 
+|dfs.secondary.http.address | dfs.namenode.secondary.http-address
 
+*---+---+
 
+|dfs.socket.timeout | dfs.client.socket-timeout
 
+*---+---+
 
+|dfs.upgrade.permission | dfs.namenode.upgrade.permission
 
+*---+---+
 
+|dfs.write.packet.size | dfs.client-write-packet-size
 
+*---+---+
 
+|fs.checkpoint.dir | dfs.namenode.checkpoint.dir
 
+*---+---+
 
+|fs.checkpoint.edits.dir | dfs.namenode.checkpoint.edits.dir
 
+*---+---+
 
+|fs.checkpoint.period | dfs.namenode.checkpoint.period
 
+*---+---+
 
+|fs.default.name | fs.defaultFS
 
+*---+---+
 
+|hadoop.configured.node.mapping | net.topology.configured.node.mapping
 
+*---+---+
 
+|hadoop.job.history.location | mapreduce.jobtracker.jobhistory.location
 
+*---+---+
 
+|hadoop.native.lib | io.native.lib.available
 
+*---+---+
 
+|hadoop.net.static.resolutions | mapreduce.tasktracker.net.static.resolutions
 
+*---+---+
 
+|hadoop.pipes.command-file.keep | mapreduce.pipes.commandfile.preserve
 
+*---+---+
 
+|hadoop.pipes.executable | mapreduce.pipes.executable
 
+*---+---+
 
+|hadoop.pipes.executable.interpretor | mapreduce.pipes.executable.interpretor
 
+*---+---+
 
+|hadoop.pipes.java.mapper | mapreduce.pipes.isjavamapper
 
+*---+---+
 
+|hadoop.pipes.java.recordreader | mapreduce.pipes.isjavarecordreader
 
+*---+---+
 
+|hadoop.pipes.java.recordwriter | mapreduce.pipes.isjavarecordwriter
 
+*---+---+
 
+|hadoop.pipes.java.reducer | mapreduce.pipes.isjavareducer
 
+*---+---+
 
+|hadoop.pipes.partitioner | mapreduce.pipes.partitioner
 
+*---+---+
 
+|heartbeat.recheck.interval | dfs.namenode.heartbeat.recheck-interval
 
+*---+---+
 
+|io.bytes.per.checksum | dfs.bytes-per-checksum
 
+*---+---+
 
+|io.sort.factor | mapreduce.task.io.sort.factor
 
+*---+---+
 
+|io.sort.mb | mapreduce.task.io.sort.mb
 
+*---+---+
 
+|io.sort.spill.percent | mapreduce.map.sort.spill.percent
 
+*---+---+
 
+|job.end.notification.url | mapreduce.job.end-notification.url
 
+*---+---+
 
+|job.end.retry.attempts | mapreduce.job.end-notification.retry.attempts
 
+*---+---+
 
+|job.end.retry.interval | mapreduce.job.end-notification.retry.interval
 
+*---+---+
 
+|job.local.dir | mapreduce.job.local.dir
 
+*---+---+
 
+|jobclient.completion.poll.interval | mapreduce.client.completion.pollinterval
 
+*---+---+
 
+|jobclient.output.filter | mapreduce.client.output.filter
 
+*---+---+
 
+|jobclient.progress.monitor.poll.interval | mapreduce.client.progressmonitor.pollinterval
 
+*---+---+
 
+|keep.failed.task.files | mapreduce.task.files.preserve.failedtasks
 
+*---+---+
 
+|keep.task.files.pattern | mapreduce.task.files.preserve.filepattern
 
+*---+---+
 
+|key.value.separator.in.input.line | mapreduce.input.keyvaluelinerecordreader.key.value.separator
 
+*---+---+
 
+|local.cache.size | mapreduce.tasktracker.cache.local.size
 
+*---+---+
 
+|map.input.file | mapreduce.map.input.file
 
+*---+---+
 
+|map.input.length | mapreduce.map.input.length
 
+*---+---+
 
+|map.input.start | mapreduce.map.input.start
 
+*---+---+
 
+|map.output.key.field.separator | mapreduce.map.output.key.field.separator
 
+*---+---+
 
+|map.output.key.value.fields.spec | mapreduce.fieldsel.map.output.key.value.fields.spec
 
+*---+---+
 
+|mapred.acls.enabled | mapreduce.cluster.acls.enabled
 
+*---+---+
 
+|mapred.binary.partitioner.left.offset | mapreduce.partition.binarypartitioner.left.offset
 
+*---+---+
 
+|mapred.binary.partitioner.right.offset | mapreduce.partition.binarypartitioner.right.offset
 
+*---+---+
 
+|mapred.cache.archives | mapreduce.job.cache.archives
 
+*---+---+
 
+|mapred.cache.archives.timestamps | mapreduce.job.cache.archives.timestamps
 
+*---+---+
 
+|mapred.cache.files | mapreduce.job.cache.files
 
+*---+---+
 
+|mapred.cache.files.timestamps | mapreduce.job.cache.files.timestamps
 
+*---+---+
 
+|mapred.cache.localArchives | mapreduce.job.cache.local.archives
 
+*---+---+
 
+|mapred.cache.localFiles | mapreduce.job.cache.local.files
 
+*---+---+
 
+|mapred.child.tmp | mapreduce.task.tmp.dir
 
+*---+---+
 
+|mapred.cluster.average.blacklist.threshold | mapreduce.jobtracker.blacklist.average.threshold
 
+*---+---+
 
+|mapred.cluster.map.memory.mb | mapreduce.cluster.mapmemory.mb
 
+*---+---+
 
+|mapred.cluster.max.map.memory.mb | mapreduce.jobtracker.maxmapmemory.mb
 
+*---+---+
 
+|mapred.cluster.max.reduce.memory.mb | mapreduce.jobtracker.maxreducememory.mb
 
+*---+---+
 
+|mapred.cluster.reduce.memory.mb | mapreduce.cluster.reducememory.mb
 
+*---+---+
 
+|mapred.committer.job.setup.cleanup.needed | mapreduce.job.committer.setup.cleanup.needed
 
+*---+---+
 
+|mapred.compress.map.output | mapreduce.map.output.compress
 
+*---+---+
 
+|mapred.create.symlink | mapreduce.job.cache.symlink.create
 
+*---+---+
 
+|mapred.data.field.separator | mapreduce.fieldsel.data.field.separator
 
+*---+---+
 
+|mapred.debug.out.lines | mapreduce.task.debugout.lines
 
+*---+---+
 
+|mapred.healthChecker.interval | mapreduce.tasktracker.healthchecker.interval
 
+*---+---+
 
+|mapred.healthChecker.script.args | mapreduce.tasktracker.healthchecker.script.args
 
+*---+---+
 
+|mapred.healthChecker.script.path | mapreduce.tasktracker.healthchecker.script.path
 
+*---+---+
 
+|mapred.healthChecker.script.timeout | mapreduce.tasktracker.healthchecker.script.timeout
 
+*---+---+
 
+|mapred.heartbeats.in.second | mapreduce.jobtracker.heartbeats.in.second
 
+*---+---+
 
+|mapred.hosts | mapreduce.jobtracker.hosts.filename
 
+*---+---+
 
+|mapred.hosts.exclude | mapreduce.jobtracker.hosts.exclude.filename
 
+*---+---+
 
+|mapred.inmem.merge.threshold | mapreduce.reduce.merge.inmem.threshold
 
+*---+---+
 
+|mapred.input.dir | mapreduce.input.fileinputformat.inputdir
 
+*---+---+
 
+|mapred.input.dir.formats | mapreduce.input.multipleinputs.dir.formats
 
+*---+---+
 
+|mapred.input.dir.mappers | mapreduce.input.multipleinputs.dir.mappers
 
+*---+---+
 
+|mapred.input.pathFilter.class | mapreduce.input.pathFilter.class
 
+*---+---+
 
+|mapred.jar | mapreduce.job.jar
 
+*---+---+
 
+|mapred.job.classpath.archives | mapreduce.job.classpath.archives
 
+*---+---+
 
+|mapred.job.classpath.files | mapreduce.job.classpath.files
 
+*---+---+
 
+|mapred.job.id | mapreduce.job.id
 
+*---+---+
 
+|mapred.job.map.memory.mb | mapreduce.map.memory.mb
 
+*---+---+
 
+|mapred.job.name | mapreduce.job.name
 
+*---+---+
 
+|mapred.job.priority | mapreduce.job.priority
 
+*---+---+
 
+|mapred.job.queue.name | mapreduce.job.queuename
 
+*---+---+
 
+|mapred.job.reduce.input.buffer.percent | mapreduce.reduce.input.buffer.percent
 
+*---+---+
 
+|mapred.job.reduce.markreset.buffer.percent | mapreduce.reduce.markreset.buffer.percent
 
+*---+---+
 
+|mapred.job.reduce.memory.mb | mapreduce.reduce.memory.mb
 
+*---+---+
 
+|mapred.job.reduce.total.mem.bytes | mapreduce.reduce.memory.totalbytes
 
+*---+---+
 
+|mapred.job.reuse.jvm.num.tasks | mapreduce.job.jvm.numtasks
 
+*---+---+
 
+|mapred.job.shuffle.input.buffer.percent | mapreduce.reduce.shuffle.input.buffer.percent
 
+*---+---+
 
+|mapred.job.shuffle.merge.percent | mapreduce.reduce.shuffle.merge.percent
 
+*---+---+
 
+|mapred.job.tracker | mapreduce.jobtracker.address
 
+*---+---+
 
+|mapred.job.tracker.handler.count | mapreduce.jobtracker.handler.count
 
+*---+---+
 
+|mapred.job.tracker.history.completed.location | mapreduce.jobtracker.jobhistory.completed.location
 
+*---+---+
 
+|mapred.job.tracker.http.address | mapreduce.jobtracker.http.address
 
+*---+---+
 
+|mapred.job.tracker.jobhistory.lru.cache.size | mapreduce.jobtracker.jobhistory.lru.cache.size
 
+*---+---+
 
+|mapred.job.tracker.persist.jobstatus.active | mapreduce.jobtracker.persist.jobstatus.active
 
+*---+---+
 
+|mapred.job.tracker.persist.jobstatus.dir | mapreduce.jobtracker.persist.jobstatus.dir
 
+*---+---+
 
+|mapred.job.tracker.persist.jobstatus.hours | mapreduce.jobtracker.persist.jobstatus.hours
 
+*---+---+
 
+|mapred.job.tracker.retire.jobs | mapreduce.jobtracker.retirejobs
 
+*---+---+
 
+|mapred.job.tracker.retiredjobs.cache.size | mapreduce.jobtracker.retiredjobs.cache.size
 
+*---+---+
 
+|mapred.jobinit.threads | mapreduce.jobtracker.jobinit.threads
 
+*---+---+
 
+|mapred.jobtracker.instrumentation | mapreduce.jobtracker.instrumentation
 
+*---+---+
 
+|mapred.jobtracker.job.history.block.size | mapreduce.jobtracker.jobhistory.block.size
 
+*---+---+
 
+|mapred.jobtracker.maxtasks.per.job | mapreduce.jobtracker.maxtasks.perjob
 
+*---+---+
 
+|mapred.jobtracker.restart.recover | mapreduce.jobtracker.restart.recover
 
+*---+---+
 
+|mapred.jobtracker.taskScheduler | mapreduce.jobtracker.taskscheduler
 
+*---+---+
 
+|mapred.jobtracker.taskScheduler.maxRunningTasksPerJob | mapreduce.jobtracker.taskscheduler.maxrunningtasks.perjob
 
+*---+---+
 
+|mapred.jobtracker.taskalloc.capacitypad | mapreduce.jobtracker.taskscheduler.taskalloc.capacitypad
 
+*---+---+
 
+|mapred.join.expr | mapreduce.join.expr
 
+*---+---+
 
+|mapred.join.keycomparator | mapreduce.join.keycomparator
 
+*---+---+
 
+|mapred.lazy.output.format | mapreduce.output.lazyoutputformat.outputformat
 
+*---+---+
 
+|mapred.line.input.format.linespermap | mapreduce.input.lineinputformat.linespermap
 
+*---+---+
 
+|mapred.linerecordreader.maxlength | mapreduce.input.linerecordreader.line.maxlength
 
+*---+---+
 
+|mapred.local.dir | mapreduce.cluster.local.dir
 
+*---+---+
 
+|mapred.local.dir.minspacekill | mapreduce.tasktracker.local.dir.minspacekill
 
+*---+---+
 
+|mapred.local.dir.minspacestart | mapreduce.tasktracker.local.dir.minspacestart
 
+*---+---+
 
+|mapred.map.child.env | mapreduce.map.env
 
+*---+---+
 
+|mapred.map.child.java.opts | mapreduce.map.java.opts
 
+*---+---+
 
+|mapred.map.child.log.level | mapreduce.map.log.level
 
+*---+---+
 
+|mapred.map.child.ulimit | mapreduce.map.ulimit
 
+*---+---+
 
+|mapred.map.max.attempts | mapreduce.map.maxattempts
 
+*---+---+
 
+|mapred.map.output.compression.codec | mapreduce.map.output.compress.codec
 
+*---+---+
 
+|mapred.map.task.debug.script | mapreduce.map.debug.script
 
+*---+---+
 
+|mapred.map.tasks | mapreduce.job.maps
 
+*---+---+
 
+|mapred.map.tasks.speculative.execution | mapreduce.map.speculative
 
+*---+---+
 
+|mapred.mapoutput.key.class | mapreduce.map.output.key.class
 
+*---+---+
 
+|mapred.mapoutput.value.class | mapreduce.map.output.value.class
 
+*---+---+
 
+|mapred.mapper.regex | mapreduce.mapper.regex
 
+*---+---+
 
+|mapred.mapper.regex.group | mapreduce.mapper.regexmapper..group
 
+*---+---+
 
+|mapred.max.map.failures.percent | mapreduce.map.failures.maxpercent
 
+*---+---+
 
+|mapred.max.reduce.failures.percent | mapreduce.reduce.failures.maxpercent
 
+*---+---+
 
+|mapred.max.split.size | mapreduce.input.fileinputformat.split.maxsize
 
+*---+---+
 
+|mapred.max.tracker.blacklists | mapreduce.jobtracker.tasktracker.maxblacklists
 
+*---+---+
 
+|mapred.max.tracker.failures | mapreduce.job.maxtaskfailures.per.tracker
 
+*---+---+
 
+|mapred.merge.recordsBeforeProgress | mapreduce.task.merge.progress.records
 
+*---+---+
 
+|mapred.min.split.size | mapreduce.input.fileinputformat.split.minsize
 
+*---+---+
 
+|mapred.min.split.size.per.node | mapreduce.input.fileinputformat.split.minsize.per.node
 
+*---+---+
 
+|mapred.min.split.size.per.rack | mapreduce.input.fileinputformat.split.minsize.per.rack
 
+*---+---+
 
+|mapred.output.compress | mapreduce.output.fileoutputformat.compress
 
+*---+---+
 
+|mapred.output.compression.codec | mapreduce.output.fileoutputformat.compress.codec
 
+*---+---+
 
+|mapred.output.compression.type | mapreduce.output.fileoutputformat.compress.type
 
+*---+---+
 
+|mapred.output.dir | mapreduce.output.fileoutputformat.outputdir
 
+*---+---+
 
+|mapred.output.key.class | mapreduce.job.output.key.class
 
+*---+---+
 
+|mapred.output.key.comparator.class | mapreduce.job.output.key.comparator.class
 
+*---+---+
 
+|mapred.output.value.class | mapreduce.job.output.value.class
 
+*---+---+
 
+|mapred.output.value.groupfn.class | mapreduce.job.output.group.comparator.class
 
+*---+---+
 
+|mapred.permissions.supergroup | mapreduce.cluster.permissions.supergroup
 
+*---+---+
 
+|mapred.pipes.user.inputformat | mapreduce.pipes.inputformat
 
+*---+---+
 
+|mapred.reduce.child.env | mapreduce.reduce.env
 
+*---+---+
 
+|mapred.reduce.child.java.opts | mapreduce.reduce.java.opts
 
+*---+---+
 
+|mapred.reduce.child.log.level | mapreduce.reduce.log.level
 
+*---+---+
 
+|mapred.reduce.child.ulimit | mapreduce.reduce.ulimit
 
+*---+---+
 
+|mapred.reduce.max.attempts | mapreduce.reduce.maxattempts
 
+*---+---+
 
+|mapred.reduce.parallel.copies | mapreduce.reduce.shuffle.parallelcopies
 
+*---+---+
 
+|mapred.reduce.slowstart.completed.maps | mapreduce.job.reduce.slowstart.completedmaps
 
+*---+---+
 
+|mapred.reduce.task.debug.script | mapreduce.reduce.debug.script
 
+*---+---+
 
+|mapred.reduce.tasks | mapreduce.job.reduces
 
+*---+---+
 
+|mapred.reduce.tasks.speculative.execution | mapreduce.reduce.speculative
 
+*---+---+
 
+|mapred.seqbinary.output.key.class | mapreduce.output.seqbinaryoutputformat.key.class
 
+*---+---+
 
+|mapred.seqbinary.output.value.class | mapreduce.output.seqbinaryoutputformat.value.class
 
+*---+---+
 
+|mapred.shuffle.connect.timeout | mapreduce.reduce.shuffle.connect.timeout
 
+*---+---+
 
+|mapred.shuffle.read.timeout | mapreduce.reduce.shuffle.read.timeout
 
+*---+---+
 
+|mapred.skip.attempts.to.start.skipping | mapreduce.task.skip.start.attempts
 
+*---+---+
 
+|mapred.skip.map.auto.incr.proc.count | mapreduce.map.skip.proc-count.auto-incr
 
+*---+---+
 
+|mapred.skip.map.max.skip.records | mapreduce.map.skip.maxrecords
 
+*---+---+
 
+|mapred.skip.on | mapreduce.job.skiprecords
 
+*---+---+
 
+|mapred.skip.out.dir | mapreduce.job.skip.outdir
 
+*---+---+
 
+|mapred.skip.reduce.auto.incr.proc.count | mapreduce.reduce.skip.proc-count.auto-incr
 
+*---+---+
 
+|mapred.skip.reduce.max.skip.groups | mapreduce.reduce.skip.maxgroups
 
+*---+---+
 
+|mapred.speculative.execution.slowNodeThreshold | mapreduce.job.speculative.slownodethreshold
 
+*---+---+
 
+|mapred.speculative.execution.slowTaskThreshold | mapreduce.job.speculative.slowtaskthreshold
 
+*---+---+
 
+|mapred.speculative.execution.speculativeCap | mapreduce.job.speculative.speculativecap
 
+*---+---+
 
+|mapred.submit.replication | mapreduce.client.submit.file.replication
 
+*---+---+
 
+|mapred.system.dir | mapreduce.jobtracker.system.dir
 
+*---+---+
 
+|mapred.task.cache.levels | mapreduce.jobtracker.taskcache.levels
 
+*---+---+
 
+|mapred.task.id | mapreduce.task.attempt.id
 
+*---+---+
 
+|mapred.task.is.map | mapreduce.task.ismap
 
+*---+---+
 
+|mapred.task.partition | mapreduce.task.partition
 
+*---+---+
 
+|mapred.task.profile | mapreduce.task.profile
 
+*---+---+
 
+|mapred.task.profile.maps | mapreduce.task.profile.maps
 
+*---+---+
 
+|mapred.task.profile.params | mapreduce.task.profile.params
 
+*---+---+
 
+|mapred.task.profile.reduces | mapreduce.task.profile.reduces
 
+*---+---+
 
+|mapred.task.timeout | mapreduce.task.timeout
 
+*---+---+
 
+|mapred.task.tracker.http.address | mapreduce.tasktracker.http.address
 
+*---+---+
 
+|mapred.task.tracker.report.address | mapreduce.tasktracker.report.address
 
+*---+---+
 
+|mapred.task.tracker.task-controller | mapreduce.tasktracker.taskcontroller
 
+*---+---+
 
+|mapred.tasktracker.dns.interface | mapreduce.tasktracker.dns.interface
 
+*---+---+
 
+|mapred.tasktracker.dns.nameserver | mapreduce.tasktracker.dns.nameserver
 
+*---+---+
 
+|mapred.tasktracker.events.batchsize | mapreduce.tasktracker.events.batchsize
 
+*---+---+
 
+|mapred.tasktracker.expiry.interval | mapreduce.jobtracker.expire.trackers.interval
 
+*---+---+
 
+|mapred.tasktracker.indexcache.mb | mapreduce.tasktracker.indexcache.mb
 
+*---+---+
 
+|mapred.tasktracker.instrumentation | mapreduce.tasktracker.instrumentation
 
+*---+---+
 
+|mapred.tasktracker.map.tasks.maximum | mapreduce.tasktracker.map.tasks.maximum
 
+*---+---+
 
+|mapred.tasktracker.memory_calculator_plugin | mapreduce.tasktracker.resourcecalculatorplugin
 
+*---+---+
 
+|mapred.tasktracker.memorycalculatorplugin | mapreduce.tasktracker.resourcecalculatorplugin
 
+*---+---+
 
+|mapred.tasktracker.reduce.tasks.maximum | mapreduce.tasktracker.reduce.tasks.maximum
 
+*---+---+
 
+|mapred.tasktracker.taskmemorymanager.monitoring-interval | mapreduce.tasktracker.taskmemorymanager.monitoringinterval
 
+*---+---+
 
+|mapred.tasktracker.tasks.sleeptime-before-sigkill | mapreduce.tasktracker.tasks.sleeptimebeforesigkill
 
+*---+---+
 
+|mapred.temp.dir | mapreduce.cluster.temp.dir
 
+*---+---+
 
+|mapred.text.key.comparator.options | mapreduce.partition.keycomparator.options
 
+*---+---+
 
+|mapred.text.key.partitioner.options | mapreduce.partition.keypartitioner.options
 
+*---+---+
 
+|mapred.textoutputformat.separator | mapreduce.output.textoutputformat.separator
 
+*---+---+
 
+|mapred.tip.id | mapreduce.task.id
 
+*---+---+
 
+|mapred.used.genericoptionsparser | mapreduce.client.genericoptionsparser.used
 
+*---+---+
 
+|mapred.userlog.limit.kb | mapreduce.task.userlog.limit.kb
 
+*---+---+
 
+|mapred.userlog.retain.hours | mapreduce.job.userlog.retain.hours
 
+*---+---+
 
+|mapred.work.output.dir | mapreduce.task.output.dir
 
+*---+---+
 
+|mapred.working.dir | mapreduce.job.working.dir
 
+*---+---+
 
+|mapreduce.combine.class | mapreduce.job.combine.class
 
+*---+---+
 
+|mapreduce.inputformat.class | mapreduce.job.inputformat.class
 
+*---+---+
 
+|mapreduce.jobtracker.permissions.supergroup | mapreduce.cluster.permissions.supergroup
 
+*---+---+
 
+|mapreduce.map.class | mapreduce.job.map.class
 
+*---+---+
 
+|mapreduce.outputformat.class | mapreduce.job.outputformat.class
 
+*---+---+
 
+|mapreduce.partitioner.class | mapreduce.job.partitioner.class
 
+*---+---+
 
+|mapreduce.reduce.class | mapreduce.job.reduce.class
 
+*---+---+
 
+|min.num.spills.for.combine | mapreduce.map.combine.minspills
 
+*---+---+
 
+|reduce.output.key.value.fields.spec | mapreduce.fieldsel.reduce.output.key.value.fields.spec
 
+*---+---+
 
+|security.job.submission.protocol.acl | security.job.client.protocol.acl
 
+*---+---+
 
+|security.task.umbilical.protocol.acl | security.job.task.protocol.acl
 
+*---+---+
 
+|sequencefile.filter.class | mapreduce.input.sequencefileinputfilter.class
 
+*---+---+
 
+|sequencefile.filter.frequency | mapreduce.input.sequencefileinputfilter.frequency
 
+*---+---+
 
+|sequencefile.filter.regex | mapreduce.input.sequencefileinputfilter.regex
 
+*---+---+
 
+|session.id | dfs.metrics.session-id
 
+*---+---+
 
+|slave.host.name | dfs.datanode.hostname
 
+*---+---+
 
+|slave.host.name | mapreduce.tasktracker.host.name
 
+*---+---+
 
+|tasktracker.contention.tracking | mapreduce.tasktracker.contention.tracking
 
+*---+---+
 
+|tasktracker.http.threads | mapreduce.tasktracker.http.threads
 
+*---+---+
 
+|topology.node.switch.mapping.impl | net.topology.node.switch.mapping.impl
 
+*---+---+
 
+|topology.script.file.name | net.topology.script.file.name
 
+*---+---+
 
+|topology.script.number.args | net.topology.script.number.args
 
+*---+---+
 
+|user.name | mapreduce.job.user.name
 
+*---+---+
 
+|webinterface.private.actions | mapreduce.jobtracker.webinterface.trusted
 
+*---+---+

+ 12 - 0
hadoop-hdfs-project/hadoop-hdfs/pom.xml
查看文件 

@@ -270,6 +270,18 @@
 
               </target>
 
               </target>
 
             </configuration>
 
             </configuration>
 
           </execution>
 
           </execution>
 
+          <execution>
 
+            <phase>pre-site</phase>
 
+            <goals>
 
+              <goal>run</goal>
 
+            </goals>
 
+            <configuration>
 
+              <tasks>
 
+                <copy file="src/main/resources/hdfs-default.xml" todir="src/site/resources"/>
 
+                <copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
 
+              </tasks>
 
+            </configuration>
 
+          </execution>
 
         </executions>
 
         </executions>
 
       </plugin>
 
       </plugin>
 
       <plugin>
 
       <plugin>

+ 18 - 0
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
查看文件 

@@ -64,6 +64,24 @@
 
           </execution>
 
           </execution>
 
         </executions>
 
         </executions>
 
       </plugin>
 
       </plugin>
 
+      <plugin>
 
+        <groupId>org.apache.maven.plugins</groupId>
 
+        <artifactId>maven-antrun-plugin</artifactId>
 
+        <executions>
 
+          <execution>
 
+            <phase>pre-site</phase>
 
+            <goals>
 
+              <goal>run</goal>
 
+            </goals>
 
+            <configuration>
 
+              <tasks>
 
+                <copy file="src/main/resources/mapred-default.xml" todir="src/site/resources"/>
 
+                <copy file="../../../hadoop-common-project/hadoop-common/src/main/xsl/configuration.xsl" todir="src/site/resources"/>
 
+              </tasks>
 
+            </configuration>
 
+          </execution>
 
+        </executions>
 
+      </plugin>
 
     </plugins>
 
     </plugins>
 
   </build>
 
   </build>
 
 </project>
 
 </project>

+ 30 - 0
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/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;
 
+}
 
+

+ 1 - 7
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml
查看文件 

@@ -13,16 +13,10 @@
 
 -->
 
 -->
 
 <project name="Hadoop MapReduce Next Gen">
 
 <project name="Hadoop MapReduce Next Gen">
 
 
 
-  <version position="right"/>
 
-
 
-  <bannerLeft>
 
-    <name>&nbsp;</name>
 
-  </bannerLeft>
 
-
 
   <skin>
 
   <skin>
 
     <groupId>org.apache.maven.skins</groupId>
 
     <groupId>org.apache.maven.skins</groupId>
 
     <artifactId>maven-stylus-skin</artifactId>
 
     <artifactId>maven-stylus-skin</artifactId>
 
-    <version>1.1</version>
 
+    <version>1.2</version>
 
   </skin>
 
   </skin>
 
 
 
   <body>
 
   <body>

+ 0 - 1
hadoop-mapreduce-project/hadoop-yarn/pom.xml
查看文件 

@@ -25,7 +25,6 @@
 
   <version>0.24.0-SNAPSHOT</version>
 
   <version>0.24.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 
   <packaging>pom</packaging>
 
   <name>hadoop-yarn</name>
 
   <name>hadoop-yarn</name>
 
-  <url>http://hadoop.apache.org/mapreduce</url>
 
 
 
   <properties>
 
   <properties>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+ 1 - 1
hadoop-project/pom.xml
查看文件 

@@ -472,7 +472,7 @@
 
         <plugin>
 
         <plugin>
 
           <groupId>org.apache.maven.plugins</groupId>
 
           <groupId>org.apache.maven.plugins</groupId>
 
           <artifactId>maven-site-plugin</artifactId>
 
           <artifactId>maven-site-plugin</artifactId>
 
-          <version>2.2</version>
 
+          <version>3.0</version>
 
         </plugin>
 
         </plugin>
 
         <plugin>
 
         <plugin>
 
           <groupId>org.apache.maven.plugins</groupId>
 
           <groupId>org.apache.maven.plugins</groupId>

+ 29 - 0
hadoop-project/src/site/apt/index.apt.vm
查看文件 

@@ -0,0 +1,29 @@
 
+~~ 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.
 
+
 
+  ---
 
+  Hadoop ${project.version}
 
+  ---
 
+  ---
 
+  ${maven.build.timestamp}
 
+  
+  
+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
 
+  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
 
+  to set up a multi-node Hadoop installation.
 
+  
+

+ 30 - 0
hadoop-project/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;
 
+}
 
+

+ 80 - 0
hadoop-project/src/site/site.xml
查看文件 

@@ -0,0 +1,80 @@
 
+<?xml version="1.0" encoding="ISO-8859-1"?>
 
+<!--
 
+  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.
 
+-->
 
+<project name="Hadoop">
 
+  <bannerLeft>
 
+    <name>Hadoop</name>
 
+    <src>http://hadoop.apache.org/images/hadoop-logo.jpg</src>
 
+    <href>http://hadoop.apache.org/</href>
 
+  </bannerLeft>
 
+  <bannerRight>
 
+    <src>http://www.apache.org/images/asf_logo_wide.png</src>
 
+    <href>http://www.apache.org/</href>
 
+  </bannerRight>
 
+
 
+  <publishDate position="right"/>
 
+  <version position="right"/>
 
+
 
+  <skin>
 
+    <groupId>org.apache.maven.skins</groupId>
 
+    <artifactId>maven-stylus-skin</artifactId>
 
+    <version>1.2</version>
 
+  </skin>
 
+
 
+  <body>
 
+    <links position="left">
 
+      <item name="Wiki" href="http://wiki.apache.org/hadoop" />
 
+      <item name="SVN" href="https://svn.apache.org/repos/asf/hadoop/" />
 
+    </links>
 
+
 
+    <breadcrumbs position="left">
 
+      <item name="Apache" href="http://www.apache.org/" />
 
+      <item name="Hadoop" href="http://hadoop.apache.org/"/>
 
+    </breadcrumbs>
 
+
 
+    <menu name="Auth" inherit="top">
 
+      <item name="Overview" href="hadoop-auth/index.html"/>
 
+      <item name="Examples" href="hadoop-auth/Examples.html"/>
 
+      <item name="Configuration" href="hadoop-auth/Configuration.html"/>
 
+      <item name="Building" href="hadoop-auth/BuildingIt.html"/>
 
+    </menu>
 
+    
+    <menu name="Common" inherit="top">
 
+    </menu>
 
+    
+    <menu name="HDFS" inherit="top">
 
+      <item name="Federation" href="hadoop-yarn/hadoop-yarn-site/Federation.html"/>
 
+    </menu>
 
+
 
+    <menu name="MapReduce" inherit="top">
 
+      <item name="Overview" href="hadoop-yarn/hadoop-yarn-site/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="Writing Yarn Applications" href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>
 
+      <item name="Capacity Scheduler" href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
 
+    </menu>
 
+    
+    <menu name="Configuration Reference" inherit="top">
 
+      <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="mapred-default.xml" href="hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml"/>
 
+      <item name="Deprecated Properties" href="hadoop-project-dist/hadoop-common/DeprecatedProperties.html"/>
 
+    </menu>
 
+
 
+  </body>
 
+
 
+</project>

+ 22 - 2
pom.xml
查看文件 

@@ -32,6 +32,10 @@
 
       <name>${distMgmtSnapshotsName}</name>
 
       <name>${distMgmtSnapshotsName}</name>
 
       <url>${distMgmtSnapshotsUrl}</url>
 
       <url>${distMgmtSnapshotsUrl}</url>
 
     </snapshotRepository>
 
     </snapshotRepository>
 
+    <site>
 
+      <id>apache.website</id>
 
+      <url>scpexe://people.apache.org/www/hadoop.apache.org/docs/r${project.version}</url>
 
+    </site>
 
   </distributionManagement>
 
   </distributionManagement>
 
 
 
   <repositories>
 
   <repositories>
 
@@ -103,7 +107,11 @@
 
         <plugin>
 
         <plugin>
 
           <groupId>org.apache.maven.plugins</groupId>
 
           <groupId>org.apache.maven.plugins</groupId>
 
           <artifactId>maven-site-plugin</artifactId>
 
           <artifactId>maven-site-plugin</artifactId>
 
-          <version>2.2</version>
 
+          <version>3.0</version>
 
+          <configuration>
 
+            <!-- Reports are generated at the site level -->
 
+            <generateReports>false</generateReports>
 
+          </configuration>
 
         </plugin>
 
         </plugin>
 
       </plugins>
 
       </plugins>
 
     </pluginManagement>
 
     </pluginManagement>
 
@@ -156,10 +164,22 @@
 
             <include>pom.xml</include>
 
             <include>pom.xml</include>
 
           </includes>
 
           </includes>
 
         </configuration>
 
         </configuration>
 
+      </plugin>
 
+            <plugin>
 
+        <artifactId>maven-site-plugin</artifactId>
 
+        <version>3.0</version>
 
+        <executions>
 
+          <execution>
 
+            <id>attach-descriptor</id>
 
+            <goals>
 
+              <goal>attach-descriptor</goal>
 
+            </goals>
 
+          </execution>
 
+        </executions>
 
       </plugin>
 
       </plugin>
 
     </plugins>
 
     </plugins>
 
   </build>
 
   </build>
 
-
 
+  
   <profiles>
 
   <profiles>
 
     <profile>
 
     <profile>
 
       <id>src</id>
 
       <id>src</id>