HADOOP-9190. packaging docs is broken. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1439796 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Aaron Myers
parent
203a9c0f72
commit
33cee25aad
@ -6,7 +6,6 @@ Requirements:
|
|||||||
* Unix System
|
* Unix System
|
||||||
* JDK 1.6
|
* JDK 1.6
|
||||||
* Maven 3.0
|
* Maven 3.0
|
||||||
* Forrest 0.8 (if generating docs)
|
|
||||||
* Findbugs 1.3.9 (if running findbugs)
|
* Findbugs 1.3.9 (if running findbugs)
|
||||||
* ProtocolBuffer 2.4.1+ (for MapReduce and HDFS)
|
* ProtocolBuffer 2.4.1+ (for MapReduce and HDFS)
|
||||||
* CMake 2.6 or newer (if compiling native code)
|
* CMake 2.6 or newer (if compiling native code)
|
||||||
|
|||||||
@ -331,6 +331,8 @@ Trunk (Unreleased)
|
|||||||
HADOOP-9246 Execution phase for hadoop-maven-plugin should be
|
HADOOP-9246 Execution phase for hadoop-maven-plugin should be
|
||||||
process-resources (Karthik Kambatla and Chris Nauroth via jlowe)
|
process-resources (Karthik Kambatla and Chris Nauroth via jlowe)
|
||||||
|
|
||||||
|
HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
|
||||||
|
|
||||||
Release 2.0.3-alpha - Unreleased
|
Release 2.0.3-alpha - Unreleased
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|||||||
@ -1,112 +0,0 @@
|
|||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
|
|
||||||
##############
|
|
||||||
# Properties used by forrest.build.xml for building the website
|
|
||||||
# These are the defaults, un-comment them if you need to change them.
|
|
||||||
##############
|
|
||||||
|
|
||||||
# Prints out a summary of Forrest settings for this project
|
|
||||||
#forrest.echo=true
|
|
||||||
|
|
||||||
# Project name (used to name .war file)
|
|
||||||
#project.name=my-project
|
|
||||||
|
|
||||||
# Specifies name of Forrest skin to use
|
|
||||||
#project.skin=tigris
|
|
||||||
#project.skin=pelt
|
|
||||||
|
|
||||||
# comma separated list, file:// is supported
|
|
||||||
#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
|
|
||||||
|
|
||||||
##############
|
|
||||||
# behavioural properties
|
|
||||||
#project.menu-scheme=tab_attributes
|
|
||||||
#project.menu-scheme=directories
|
|
||||||
|
|
||||||
##############
|
|
||||||
# layout properties
|
|
||||||
|
|
||||||
# Properties that can be set to override the default locations
|
|
||||||
#
|
|
||||||
# Parent properties must be set. This usually means uncommenting
|
|
||||||
# project.content-dir if any other property using it is uncommented
|
|
||||||
|
|
||||||
#project.status=status.xml
|
|
||||||
#project.content-dir=src/documentation
|
|
||||||
#project.raw-content-dir=${project.content-dir}/content
|
|
||||||
#project.conf-dir=${project.content-dir}/conf
|
|
||||||
#project.sitemap-dir=${project.content-dir}
|
|
||||||
#project.xdocs-dir=${project.content-dir}/content/xdocs
|
|
||||||
#project.resources-dir=${project.content-dir}/resources
|
|
||||||
#project.stylesheets-dir=${project.resources-dir}/stylesheets
|
|
||||||
#project.images-dir=${project.resources-dir}/images
|
|
||||||
#project.schema-dir=${project.resources-dir}/schema
|
|
||||||
#project.skins-dir=${project.content-dir}/skins
|
|
||||||
#project.skinconf=${project.content-dir}/skinconf.xml
|
|
||||||
#project.lib-dir=${project.content-dir}/lib
|
|
||||||
#project.classes-dir=${project.content-dir}/classes
|
|
||||||
#project.translations-dir=${project.content-dir}/translations
|
|
||||||
|
|
||||||
##############
|
|
||||||
# validation properties
|
|
||||||
|
|
||||||
# This set of properties determine if validation is performed
|
|
||||||
# Values are inherited unless overridden.
|
|
||||||
# e.g. if forrest.validate=false then all others are false unless set to true.
|
|
||||||
#forrest.validate=true
|
|
||||||
#forrest.validate.xdocs=${forrest.validate}
|
|
||||||
#forrest.validate.skinconf=${forrest.validate}
|
|
||||||
# Workaround (HADOOP-7072) for http://issues.apache.org/jira/browse/FOR-984
|
|
||||||
# Remove when forrest-0.9 is available
|
|
||||||
forrest.validate.sitemap=false
|
|
||||||
forrest.validate.stylesheets=false
|
|
||||||
# End of forrest-0.8 + JDK6 workaround
|
|
||||||
#forrest.validate.skins=${forrest.validate}
|
|
||||||
forrest.validate.skins.stylesheets=false
|
|
||||||
|
|
||||||
# *.failonerror=(true|false) - stop when an XML file is invalid
|
|
||||||
#forrest.validate.failonerror=true
|
|
||||||
|
|
||||||
# *.excludes=(pattern) - comma-separated list of path patterns to not validate
|
|
||||||
# e.g.
|
|
||||||
#forrest.validate.xdocs.excludes=samples/subdir/**, samples/faq.xml
|
|
||||||
#forrest.validate.xdocs.excludes=
|
|
||||||
|
|
||||||
|
|
||||||
##############
|
|
||||||
# General Forrest properties
|
|
||||||
|
|
||||||
# The URL to start crawling from
|
|
||||||
#project.start-uri=linkmap.html
|
|
||||||
# Set logging level for messages printed to the console
|
|
||||||
# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
|
|
||||||
#project.debuglevel=ERROR
|
|
||||||
# Max memory to allocate to Java
|
|
||||||
#forrest.maxmemory=64m
|
|
||||||
# Any other arguments to pass to the JVM. For example, to run on an X-less
|
|
||||||
# server, set to -Djava.awt.headless=true
|
|
||||||
#forrest.jvmargs=
|
|
||||||
# The bugtracking URL - the issue number will be appended
|
|
||||||
#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
|
|
||||||
#project.bugtracking-url=http://issues.apache.org/jira/browse/
|
|
||||||
# The issues list as rss
|
|
||||||
#project.issues-rss-url=
|
|
||||||
#I18n Property only works for the "forrest run" target.
|
|
||||||
#project.i18n=true
|
|
||||||
project.configfile=${project.home}/src/documentation/conf/cli.xconf
|
|
||||||
|
|
||||||
@ -1,112 +0,0 @@
|
|||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
|
|
||||||
##############
|
|
||||||
# Properties used by forrest.build.xml for building the website
|
|
||||||
# These are the defaults, un-comment them if you need to change them.
|
|
||||||
##############
|
|
||||||
|
|
||||||
# Prints out a summary of Forrest settings for this project
|
|
||||||
#forrest.echo=true
|
|
||||||
|
|
||||||
# Project name (used to name .war file)
|
|
||||||
#project.name=my-project
|
|
||||||
|
|
||||||
# Specifies name of Forrest skin to use
|
|
||||||
#project.skin=tigris
|
|
||||||
#project.skin=pelt
|
|
||||||
|
|
||||||
# comma separated list, file:// is supported
|
|
||||||
#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
|
|
||||||
|
|
||||||
##############
|
|
||||||
# behavioural properties
|
|
||||||
#project.menu-scheme=tab_attributes
|
|
||||||
#project.menu-scheme=directories
|
|
||||||
|
|
||||||
##############
|
|
||||||
# layout properties
|
|
||||||
|
|
||||||
# Properties that can be set to override the default locations
|
|
||||||
#
|
|
||||||
# Parent properties must be set. This usually means uncommenting
|
|
||||||
# project.content-dir if any other property using it is uncommented
|
|
||||||
|
|
||||||
#project.status=status.xml
|
|
||||||
#project.content-dir=src/documentation
|
|
||||||
#project.raw-content-dir=${project.content-dir}/content
|
|
||||||
#project.conf-dir=${project.content-dir}/conf
|
|
||||||
#project.sitemap-dir=${project.content-dir}
|
|
||||||
#project.xdocs-dir=${project.content-dir}/content/xdocs
|
|
||||||
#project.resources-dir=${project.content-dir}/resources
|
|
||||||
#project.stylesheets-dir=${project.resources-dir}/stylesheets
|
|
||||||
#project.images-dir=${project.resources-dir}/images
|
|
||||||
#project.schema-dir=${project.resources-dir}/schema
|
|
||||||
#project.skins-dir=${project.content-dir}/skins
|
|
||||||
#project.skinconf=${project.content-dir}/skinconf.xml
|
|
||||||
#project.lib-dir=${project.content-dir}/lib
|
|
||||||
#project.classes-dir=${project.content-dir}/classes
|
|
||||||
#project.translations-dir=${project.content-dir}/translations
|
|
||||||
|
|
||||||
##############
|
|
||||||
# validation properties
|
|
||||||
|
|
||||||
# This set of properties determine if validation is performed
|
|
||||||
# Values are inherited unless overridden.
|
|
||||||
# e.g. if forrest.validate=false then all others are false unless set to true.
|
|
||||||
#forrest.validate=true
|
|
||||||
#forrest.validate.xdocs=${forrest.validate}
|
|
||||||
#forrest.validate.skinconf=${forrest.validate}
|
|
||||||
# Workaround (HADOOP-7072) for http://issues.apache.org/jira/browse/FOR-984
|
|
||||||
# Remove when forrest-0.9 is available
|
|
||||||
forrest.validate.sitemap=false
|
|
||||||
forrest.validate.stylesheets=false
|
|
||||||
# End of forrest-0.8 + JDK6 workaround
|
|
||||||
#forrest.validate.skins=${forrest.validate}
|
|
||||||
forrest.validate.skins.stylesheets=false
|
|
||||||
|
|
||||||
# *.failonerror=(true|false) - stop when an XML file is invalid
|
|
||||||
#forrest.validate.failonerror=true
|
|
||||||
|
|
||||||
# *.excludes=(pattern) - comma-separated list of path patterns to not validate
|
|
||||||
# e.g.
|
|
||||||
#forrest.validate.xdocs.excludes=samples/subdir/**, samples/faq.xml
|
|
||||||
#forrest.validate.xdocs.excludes=
|
|
||||||
|
|
||||||
|
|
||||||
##############
|
|
||||||
# General Forrest properties
|
|
||||||
|
|
||||||
# The URL to start crawling from
|
|
||||||
#project.start-uri=linkmap.html
|
|
||||||
# Set logging level for messages printed to the console
|
|
||||||
# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
|
|
||||||
#project.debuglevel=ERROR
|
|
||||||
# Max memory to allocate to Java
|
|
||||||
#forrest.maxmemory=64m
|
|
||||||
# Any other arguments to pass to the JVM. For example, to run on an X-less
|
|
||||||
# server, set to -Djava.awt.headless=true
|
|
||||||
#forrest.jvmargs=
|
|
||||||
# The bugtracking URL - the issue number will be appended
|
|
||||||
#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
|
|
||||||
#project.bugtracking-url=http://issues.apache.org/jira/browse/
|
|
||||||
# The issues list as rss
|
|
||||||
#project.issues-rss-url=
|
|
||||||
#I18n Property only works for the "forrest run" target.
|
|
||||||
#project.i18n=true
|
|
||||||
project.configfile=${project.home}/src/documentation/conf/cli.xconf
|
|
||||||
|
|
||||||
@ -247,13 +247,6 @@
|
|||||||
</copy>
|
</copy>
|
||||||
|
|
||||||
<!-- Docs -->
|
<!-- Docs -->
|
||||||
<exec dir="${project.build.directory}/docs-src"
|
|
||||||
executable="${env.FORREST_HOME}/bin/forrest"
|
|
||||||
failonerror="true">
|
|
||||||
</exec>
|
|
||||||
<copy todir="${project.build.directory}/site">
|
|
||||||
<fileset dir="${project.build.directory}/docs-src/build/site"/>
|
|
||||||
</copy>
|
|
||||||
<copy file="${project.build.directory}/docs-src/releasenotes.html"
|
<copy file="${project.build.directory}/docs-src/releasenotes.html"
|
||||||
todir="${project.build.directory}/site"/>
|
todir="${project.build.directory}/site"/>
|
||||||
<style basedir="${basedir}/src/main/resources"
|
<style basedir="${basedir}/src/main/resources"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user