From 1d54c6e5a79c0effe390062175d92e536cf9eee7 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sat, 29 Oct 2011 00:17:58 +0000 Subject: [PATCH] Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190706 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/site/resources/css/site.css | 30 + .../hadoop-auth/src/site/site.xml | 8 +- .../hadoop-common/CHANGES.txt | 2 + hadoop-common-project/hadoop-common/pom.xml | 12 + .../src/site/apt/DeprecatedProperties.apt.vm | 544 ++++++++++++++++++ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 12 + .../hadoop-mapreduce-client-core/pom.xml | 18 + .../src/site/resources/css/site.css | 30 + .../hadoop-yarn-site/src/site/site.xml | 8 +- hadoop-mapreduce-project/hadoop-yarn/pom.xml | 1 - hadoop-project/pom.xml | 2 +- hadoop-project/src/site/apt/index.apt.vm | 29 + .../src/site/resources/css/site.css | 30 + hadoop-project/src/site/site.xml | 80 +++ pom.xml | 24 +- 15 files changed, 812 insertions(+), 18 deletions(-) create mode 100644 hadoop-common-project/hadoop-auth/src/site/resources/css/site.css create mode 100644 hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm create mode 100644 hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/resources/css/site.css create mode 100644 hadoop-project/src/site/apt/index.apt.vm create mode 100644 hadoop-project/src/site/resources/css/site.css create mode 100644 hadoop-project/src/site/site.xml diff --git a/hadoop-common-project/hadoop-auth/src/site/resources/css/site.css b/hadoop-common-project/hadoop-auth/src/site/resources/css/site.css new file mode 100644 index 00000000000..f830baafa8c --- /dev/null +++ b/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; +} + diff --git a/hadoop-common-project/hadoop-auth/src/site/site.xml b/hadoop-common-project/hadoop-auth/src/site/site.xml index 4fab0f0e1d9..2b3a5121b08 100644 --- a/hadoop-common-project/hadoop-auth/src/site/site.xml +++ b/hadoop-common-project/hadoop-auth/src/site/site.xml @@ -13,16 +13,10 @@ --> - - - -   - - org.apache.maven.skins maven-stylus-skin - 1.1 + 1.2 diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e0cd784cf01..2223991cb36 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -447,6 +447,8 @@ Release 0.23.0 - Unreleased HADOOP-7446. Implement CRC32C native code using SSE4.2 instructions. (Kihwal Lee and todd via todd) + HADOOP-7763. Add top-level navigation to APT docs. (tomwhite) + BUG FIXES HADOOP-7740. Fixed security audit logger configuration. (Arpit Gupta via Eric Yang) diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index a76cff3090a..a6a8ed9a2eb 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -347,6 +347,18 @@ + + pre-site + + run + + + + + + + + diff --git a/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm new file mode 100644 index 00000000000..724c970aaad --- /dev/null +++ b/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. + +*-------------------------------+-----------------------+ +|| <> || <>| +*-------------------------------+-----------------------+ +|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 +*---+---+ diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index c7d2f633c83..06efda63fb5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -270,6 +270,18 @@ + + pre-site + + run + + + + + + + + diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml index 75d9b1bfdb7..0cb9ef5aaee 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml @@ -64,6 +64,24 @@ + + org.apache.maven.plugins + maven-antrun-plugin + + + pre-site + + run + + + + + + + + + + diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/resources/css/site.css b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/resources/css/site.css new file mode 100644 index 00000000000..f830baafa8c --- /dev/null +++ b/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; +} + diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml index 35a75cb2e55..ddc7925b764 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/site.xml @@ -13,16 +13,10 @@ --> - - - -   - - org.apache.maven.skins maven-stylus-skin - 1.1 + 1.2 diff --git a/hadoop-mapreduce-project/hadoop-yarn/pom.xml b/hadoop-mapreduce-project/hadoop-yarn/pom.xml index 449eaa5bd2e..e6270262972 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/pom.xml +++ b/hadoop-mapreduce-project/hadoop-yarn/pom.xml @@ -25,7 +25,6 @@ 0.23.0-SNAPSHOT pom hadoop-yarn - http://hadoop.apache.org/mapreduce UTF-8 diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 37010918ef7..189391cd81c 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -469,7 +469,7 @@ org.apache.maven.plugins maven-site-plugin - 2.2 + 3.0 org.apache.maven.plugins diff --git a/hadoop-project/src/site/apt/index.apt.vm b/hadoop-project/src/site/apt/index.apt.vm new file mode 100644 index 00000000000..463fe2c215a --- /dev/null +++ b/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. + + diff --git a/hadoop-project/src/site/resources/css/site.css b/hadoop-project/src/site/resources/css/site.css new file mode 100644 index 00000000000..f830baafa8c --- /dev/null +++ b/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; +} + diff --git a/hadoop-project/src/site/site.xml b/hadoop-project/src/site/site.xml new file mode 100644 index 00000000000..15fe274a5c7 --- /dev/null +++ b/hadoop-project/src/site/site.xml @@ -0,0 +1,80 @@ + + + + + Hadoop + http://hadoop.apache.org/images/hadoop-logo.jpg + http://hadoop.apache.org/ + + + http://www.apache.org/images/asf_logo_wide.png + http://www.apache.org/ + + + + + + + org.apache.maven.skins + maven-stylus-skin + 1.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index d4a83689f9b..96c627b23db 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,10 @@ ${distMgmtSnapshotsName} ${distMgmtSnapshotsUrl} + + apache.website + scpexe://people.apache.org/www/hadoop.apache.org/docs/r${project.version} + @@ -103,7 +107,11 @@ org.apache.maven.plugins maven-site-plugin - 2.2 + 3.0 + + + false + @@ -156,10 +164,22 @@ pom.xml + + + maven-site-plugin + 3.0 + + + attach-descriptor + + attach-descriptor + + + - + src