Author: tomwhite Date: Sat Oct 29 00:16:16 2011 New Revision: 1190703 URL: http://svn.apache.org/viewvc?rev=1190703&view=rev Log: HADOOP-7763. Add top-level navigation to APT docs.
Added: hadoop/common/trunk/hadoop-project/src/ hadoop/common/trunk/hadoop-project/src/site/ hadoop/common/trunk/hadoop-project/src/site/apt/ hadoop/common/trunk/hadoop-project/src/site/apt/index.apt.vm (with props) hadoop/common/trunk/hadoop-project/src/site/resources/ hadoop/common/trunk/hadoop-project/src/site/resources/css/ hadoop/common/trunk/hadoop-project/src/site/resources/css/site.css (with props) hadoop/common/trunk/hadoop-project/src/site/site.xml (with props) Modified: hadoop/common/trunk/hadoop-project/pom.xml hadoop/common/trunk/pom.xml Modified: hadoop/common/trunk/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1190703&r1=1190702&r2=1190703&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-project/pom.xml (original) +++ hadoop/common/trunk/hadoop-project/pom.xml Sat Oct 29 00:16:16 2011 @@ -472,7 +472,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>2.2</version> + <version>3.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> Added: hadoop/common/trunk/hadoop-project/src/site/apt/index.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/src/site/apt/index.apt.vm?rev=1190703&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-project/src/site/apt/index.apt.vm (added) +++ hadoop/common/trunk/hadoop-project/src/site/apt/index.apt.vm Sat Oct 29 00:16:16 2011 @@ -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. + + Propchange: hadoop/common/trunk/hadoop-project/src/site/apt/index.apt.vm ------------------------------------------------------------------------------ svn:eol-style = native Added: hadoop/common/trunk/hadoop-project/src/site/resources/css/site.css URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/src/site/resources/css/site.css?rev=1190703&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-project/src/site/resources/css/site.css (added) +++ hadoop/common/trunk/hadoop-project/src/site/resources/css/site.css Sat Oct 29 00:16:16 2011 @@ -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; +} + Propchange: hadoop/common/trunk/hadoop-project/src/site/resources/css/site.css ------------------------------------------------------------------------------ svn:eol-style = native Added: hadoop/common/trunk/hadoop-project/src/site/site.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/src/site/site.xml?rev=1190703&view=auto ============================================================================== --- hadoop/common/trunk/hadoop-project/src/site/site.xml (added) +++ hadoop/common/trunk/hadoop-project/src/site/site.xml Sat Oct 29 00:16:16 2011 @@ -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> Propchange: hadoop/common/trunk/hadoop-project/src/site/site.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: hadoop/common/trunk/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/pom.xml?rev=1190703&r1=1190702&r2=1190703&view=diff ============================================================================== --- hadoop/common/trunk/pom.xml (original) +++ hadoop/common/trunk/pom.xml Sat Oct 29 00:16:16 2011 @@ -32,6 +32,10 @@ <name>${distMgmtSnapshotsName}</name> <url>${distMgmtSnapshotsUrl}</url> </snapshotRepository> + <site> + <id>apache.website</id> + <url>scpexe://people.apache.org/www/hadoop.apache.org/docs/r${project.version}</url> + </site> </distributionManagement> <repositories> @@ -103,7 +107,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <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> </plugins> </pluginManagement> @@ -157,9 +165,21 @@ </includes> </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> </plugins> </build> - + <profiles> <profile> <id>src</id>