MAPREDUCE-2336. Tool-related packages should be in the Tool javadoc group.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1078964 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 0844b00..2e2f80b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -621,6 +621,9 @@
 
     MAPREDUCE-2284. TestLocalRunner.testMultiMaps times out (todd)
 
+    MAPREDUCE-2336. Tool-related packages should be in the Tool javadoc group.
+    (tomwhite)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES
diff --git a/build.xml b/build.xml
index 840d517..cb873ff 100644
--- a/build.xml
+++ b/build.xml
@@ -1056,7 +1056,7 @@
 
        <group title="Packages" packages="org.apache.*"/>
        <group title="Libraries" packages="org.apache.hadoop.mapred.lib*:org.apache.hadoop.mapreduce.lib*"/>
-       <group title="Tools" packages="org.apache.hadoop.tools"/>
+       <group title="Tools" packages="org.apache.hadoop.fs*:org.apache.hadoop.tools*:org.apache.hadoop.mapred.tool*:org.apache.hadoop.mapreduce.tool*"/>
        <group title="Examples" packages="org.apache.hadoop.examples*"/>
 
        <group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
diff --git a/src/java/org/apache/hadoop/mapred/tools/package-info.java b/src/java/org/apache/hadoop/mapred/tools/package-info.java
new file mode 100644
index 0000000..708358a
--- /dev/null
+++ b/src/java/org/apache/hadoop/mapred/tools/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Command-line tools associated with the {@link org.apache.hadoop.mapred}
+ * package.
+ */
+package org.apache.hadoop.mapred.tools;
diff --git a/src/java/org/apache/hadoop/mapreduce/tools/package-info.java b/src/java/org/apache/hadoop/mapreduce/tools/package-info.java
new file mode 100644
index 0000000..2d62d7d
--- /dev/null
+++ b/src/java/org/apache/hadoop/mapreduce/tools/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+/**
+ * Command-line tools associated with the {@link org.apache.hadoop.mapreduce}
+ * package.
+ */
+package org.apache.hadoop.mapreduce.tools;
diff --git a/src/tools/org/apache/hadoop/fs/package-info.java b/src/tools/org/apache/hadoop/fs/package-info.java
new file mode 100644
index 0000000..67ca958
--- /dev/null
+++ b/src/tools/org/apache/hadoop/fs/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * Hadoop filesystem classes for MapReduce.
+ */
+package org.apache.hadoop.fs;
diff --git a/src/tools/org/apache/hadoop/tools/package-info.java b/src/tools/org/apache/hadoop/tools/package-info.java
new file mode 100644
index 0000000..44f533e
--- /dev/null
+++ b/src/tools/org/apache/hadoop/tools/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * Command-line tools for MapReduce.
+ */
+package org.apache.hadoop.tools;