Change example code directory structure to be more maven-like: src/ma…

…in/chxx to chxx/src/main.
fengs · Jul 23, 2010 · cabdb31 · cabdb31
1 parent f5d3605
commit cabdb31
Show file tree

Hide file tree

Showing 279 changed files with 64 additions and 54 deletions.
diff --git a/src/main/app3/sh/create_ncdc_files.sh → app3/src/main/sh/create_ncdc_files.sh b/src/main/app3/sh/create_ncdc_files.sh → app3/src/main/sh/create_ncdc_files.sh
diff --git a/src/main/app3/sh/load_ncdc.sh → app3/src/main/sh/load_ncdc.sh b/src/main/app3/sh/load_ncdc.sh → app3/src/main/sh/load_ncdc.sh
diff --git a/src/main/app3/sh/load_ncdc_map.sh → app3/src/main/sh/load_ncdc_map.sh b/src/main/app3/sh/load_ncdc_map.sh → app3/src/main/sh/load_ncdc_map.sh
diff --git a/src/main/app3/sh/ncdc_files.txt → app3/src/main/sh/ncdc_files.txt b/src/main/app3/sh/ncdc_files.txt → app3/src/main/sh/ncdc_files.txt
diff --git a/src/test/book/data/.file.crc → book/src/test/data/.file.crc b/src/test/book/data/.file.crc → book/src/test/data/.file.crc
diff --git a/src/test/book/data/file → book/src/test/data/file b/src/test/book/data/file → book/src/test/data/file
diff --git a/src/test/book/data/file.gz → book/src/test/data/file.gz b/src/test/book/data/file.gz → book/src/test/data/file.gz
diff --git a/src/test/book/java/BinaryOrTextWritable.java → book/src/test/java/BinaryOrTextWritable.java b/src/test/book/java/BinaryOrTextWritable.java → book/src/test/java/BinaryOrTextWritable.java
diff --git a/src/test/book/java/BooleanWritableTest.java → book/src/test/java/BooleanWritableTest.java b/src/test/book/java/BooleanWritableTest.java → book/src/test/java/BooleanWritableTest.java
diff --git a/src/test/book/java/DateRangePathFilter.java → book/src/test/java/DateRangePathFilter.java b/src/test/book/java/DateRangePathFilter.java → book/src/test/java/DateRangePathFilter.java
diff --git a/src/test/book/java/FileDecompressorTest.java → book/src/test/java/FileDecompressorTest.java b/src/test/book/java/FileDecompressorTest.java → book/src/test/java/FileDecompressorTest.java
diff --git a/src/test/book/java/FileInputFormatTest.java → book/src/test/java/FileInputFormatTest.java b/src/test/book/java/FileInputFormatTest.java → book/src/test/java/FileInputFormatTest.java
diff --git a/src/test/book/java/FileSystemDeleteTest.java → book/src/test/java/FileSystemDeleteTest.java b/src/test/book/java/FileSystemDeleteTest.java → book/src/test/java/FileSystemDeleteTest.java
diff --git a/src/test/book/java/FileSystemGlobTest.java → book/src/test/java/FileSystemGlobTest.java b/src/test/book/java/FileSystemGlobTest.java → book/src/test/java/FileSystemGlobTest.java
diff --git a/src/test/book/java/GenericWritableTest.java → book/src/test/java/GenericWritableTest.java b/src/test/book/java/GenericWritableTest.java → book/src/test/java/GenericWritableTest.java
diff --git a/src/test/book/java/IntPairTest.java → book/src/test/java/IntPairTest.java b/src/test/book/java/IntPairTest.java → book/src/test/java/IntPairTest.java
diff --git a/...ook/java/KeyFieldBasedComparatorTest.java → ...est/java/KeyFieldBasedComparatorTest.java b/...ook/java/KeyFieldBasedComparatorTest.java → ...est/java/KeyFieldBasedComparatorTest.java
diff --git a/src/test/book/java/LineReaderTest.java → book/src/test/java/LineReaderTest.java b/src/test/book/java/LineReaderTest.java → book/src/test/java/LineReaderTest.java
diff --git a/src/test/book/java/NullWritableTest.java → book/src/test/java/NullWritableTest.java b/src/test/book/java/NullWritableTest.java → book/src/test/java/NullWritableTest.java
diff --git a/src/test/book/java/ObjectWritableTest.java → book/src/test/java/ObjectWritableTest.java b/src/test/book/java/ObjectWritableTest.java → book/src/test/java/ObjectWritableTest.java
diff --git a/src/test/book/java/RegexPathFilter.java → book/src/test/java/RegexPathFilter.java b/src/test/book/java/RegexPathFilter.java → book/src/test/java/RegexPathFilter.java
diff --git a/src/test/book/java/SplitTest.java → book/src/test/java/SplitTest.java b/src/test/book/java/SplitTest.java → book/src/test/java/SplitTest.java
diff --git a/src/test/book/java/TextInputFormatsTest.java → book/src/test/java/TextInputFormatsTest.java b/src/test/book/java/TextInputFormatsTest.java → book/src/test/java/TextInputFormatsTest.java
diff --git a/src/test/book/java/TextPairTest.java → book/src/test/java/TextPairTest.java b/src/test/book/java/TextPairTest.java → book/src/test/java/TextPairTest.java
diff --git a/src/test/book/java/VLongWritableTest.java → book/src/test/java/VLongWritableTest.java b/src/test/book/java/VLongWritableTest.java → book/src/test/java/VLongWritableTest.java
diff --git a/build.xml b/build.xml
@@ -92,18 +92,28 @@
 
 		<mkdir dir="${classes.dir}"/>
 
-		<javac destdir="${classes.dir}" debug="true" deprecation="false" optimize="false" failonerror="true" includes="${src.includes}" excludes="ch13/,ch15/">
-			<src path="${src.dir}"/>
+		<javac destdir="${classes.dir}" debug="true" deprecation="false" optimize="false" failonerror="true" includes="${src.includes}">
+			<src path="common/${src.dir}"/>
+			<src path="ch02/${src.dir}"/>
+			<src path="ch03/${src.dir}"/>
+			<src path="ch04/${src.dir}"/>
+			<src path="ch05/${src.dir}"/>
+			<src path="ch06/${src.dir}"/>
+			<src path="ch08/${src.dir}"/>
+			<src path="ch11/${src.dir}"/>
+			<src path="ch12/${src.dir}"/>
+			<src path="ch14/${src.dir}"/>
 			<classpath refid="classpath"/>
 		</javac>
 
 		<javac destdir="${classes.dir}" debug="true" deprecation="false" optimize="false" failonerror="true" includes="${src.test.includes}">
-			<src path="${src.test.dir}"/>
+			<src path="common/${src.test.dir}"/>
+			<src path="book/${src.test.dir}"/>
 			<classpath refid="classpath"/>
 		</javac>
 
         <copy todir="${classes.dir}">
-            <fileset dir="${src.dir}"/>
+            <fileset dir="."/>
             <mapper type="regexp" from=".*?/java/(.*)\.(properties|txt|xml)$$" to="\1.\2"/>
         </copy>
 
@@ -114,7 +124,7 @@
         <mkdir dir="${classes.dir}"/>
 
         <javac destdir="${classes.dir}" debug="true" deprecation="false" optimize="false" failonerror="true" includes="${src.includes}">
-            <src path="${src.dir}/ch13"/>
+            <src path="ch13/${src.dir}"/>
             <classpath refid="hbase.classpath"/>
         </javac>
 
@@ -149,13 +159,13 @@
                  output="xml:withMessages"
                  outputFile="${findbugs.report.xmlfile}">
          <auxClasspath refid="classpath"/>
-        <sourcePath path="${src.dir}/common/java" />
-        <sourcePath path="${src.dir}/ch02/java" />
-        <sourcePath path="${src.dir}/ch03/java" />
-        <sourcePath path="${src.dir}/ch04/java" />
-        <sourcePath path="${src.dir}/ch05/java" />
-        <sourcePath path="${src.dir}/ch06/java" />
-        <sourcePath path="${src.dir}/ch09/java" />
+        <sourcePath path="common/${src.dir}/common/java" />
+        <sourcePath path="ch02/${src.dir}/java" />
+        <sourcePath path="ch03/${src.dir}/java" />
+        <sourcePath path="ch04/${src.dir}/java" />
+        <sourcePath path="ch05/${src.dir}/java" />
+        <sourcePath path="ch06/${src.dir}/java" />
+        <sourcePath path="ch09/${src.dir}/java" />
          <class location="${build.dir}/job.jar" />
        </findbugs>
 

diff --git a/src/main/ch02/awk/max_temperature.sh → ch02/src/main/awk/max_temperature.sh b/src/main/ch02/awk/max_temperature.sh → ch02/src/main/awk/max_temperature.sh
diff --git a/src/main/ch02/cpp/Makefile → ch02/src/main/cpp/Makefile b/src/main/ch02/cpp/Makefile → ch02/src/main/cpp/Makefile
diff --git a/src/main/ch02/cpp/max_temperature.cpp → ch02/src/main/cpp/max_temperature.cpp b/src/main/ch02/cpp/max_temperature.cpp → ch02/src/main/cpp/max_temperature.cpp
diff --git a/...02/examples/max_temperature.cpp.input.txt → ...in/examples/max_temperature.cpp.input.txt b/...02/examples/max_temperature.cpp.input.txt → ...in/examples/max_temperature.cpp.input.txt
diff --git a/...examples/max_temperature_hadoop.input.txt → ...examples/max_temperature_hadoop.input.txt b/...examples/max_temperature_hadoop.input.txt → ...examples/max_temperature_hadoop.input.txt
@@ -1,5 +1,5 @@
 hadoop jar $HADOOP_INSTALL/contrib/streaming/hadoop-*-streaming.jar \
   -input input/ncdc/sample.txt \
   -output output \
-  -mapper src/main/ch02/ruby/max_temperature_map.rb \
-  -reducer src/main/ch02/ruby/max_temperature_reduce.rb
+  -mapper ch02/src/main/ruby/max_temperature_map.rb \
+  -reducer ch02/src/main/ruby/max_temperature_reduce.rb
diff --git a/ch02/src/main/examples/max_temperature_hadoop_cluster.input.txt b/ch02/src/main/examples/max_temperature_hadoop_cluster.input.txt
@@ -0,0 +1,7 @@
+hadoop jar $HADOOP_INSTALL/contrib/streaming/hadoop-*-streaming.jar \
+  -input input/ncdc/all \
+  -output output \
+  -mapper "ch02/src/main/ruby/max_temperature_map.rb | sort | ch02/src/main/ruby/max_temperature_reduce.rb" \
+  -reducer ch02/src/main/ruby/max_temperature_reduce.rb \
+  -file ch02/src/main/ruby/max_temperature_map.rb \
+  -file ch02/src/main/ruby/max_temperature_reduce.rb
diff --git a/src/main/ch02/java/MaxTemperature.java → ch02/src/main/java/MaxTemperature.java b/src/main/ch02/java/MaxTemperature.java → ch02/src/main/java/MaxTemperature.java
diff --git a/src/main/ch02/java/MaxTemperatureMapper.java → ch02/src/main/java/MaxTemperatureMapper.java b/src/main/ch02/java/MaxTemperatureMapper.java → ch02/src/main/java/MaxTemperatureMapper.java
diff --git a/...main/ch02/java/MaxTemperatureReducer.java → .../src/main/java/MaxTemperatureReducer.java b/...main/ch02/java/MaxTemperatureReducer.java → .../src/main/java/MaxTemperatureReducer.java
diff --git a/...ch02/java/MaxTemperatureWithCombiner.java → ...main/java/MaxTemperatureWithCombiner.java b/...ch02/java/MaxTemperatureWithCombiner.java → ...main/java/MaxTemperatureWithCombiner.java
diff --git a/src/main/ch02/java/NewMaxTemperature.java → ch02/src/main/java/NewMaxTemperature.java b/src/main/ch02/java/NewMaxTemperature.java → ch02/src/main/java/NewMaxTemperature.java
diff --git a/src/main/ch02/python/max_temperature_map.py → ch02/src/main/python/max_temperature_map.py b/src/main/ch02/python/max_temperature_map.py → ch02/src/main/python/max_temperature_map.py
diff --git a/...ain/ch02/python/max_temperature_reduce.py → ...src/main/python/max_temperature_reduce.py b/...ain/ch02/python/max_temperature_reduce.py → ...src/main/python/max_temperature_reduce.py
diff --git a/src/main/ch02/ruby/max_temperature_map.rb → ch02/src/main/ruby/max_temperature_map.rb b/src/main/ch02/ruby/max_temperature_map.rb → ch02/src/main/ruby/max_temperature_map.rb
diff --git a/src/main/ch02/ruby/max_temperature_reduce.rb → ch02/src/main/ruby/max_temperature_reduce.rb b/src/main/ch02/ruby/max_temperature_reduce.rb → ch02/src/main/ruby/max_temperature_reduce.rb
diff --git a/src/main/ch02/sh/max_temp.sh → ch02/src/main/sh/max_temp.sh b/src/main/ch02/sh/max_temp.sh → ch02/src/main/sh/max_temp.sh
@@ -12,14 +12,14 @@ hadoop MaxTemperature input/ncdc/sample.txt output
 cat output/part-00000
 : ^^ max_temp_java_output
 : vv max_temp_ruby_map
-cat input/ncdc/sample.txt | src/main/ch02/ruby/max_temperature_map.rb
+cat input/ncdc/sample.txt | ch02/src/main/ruby/max_temperature_map.rb
 : ^^ max_temp_ruby_map
 : vv max_temp_ruby_pipeline
-cat input/ncdc/sample.txt | src/main/ch02/ruby/max_temperature_map.rb | \
-  sort | src/main/ch02/ruby/max_temperature_reduce.rb
+cat input/ncdc/sample.txt | ch02/src/main/ruby/max_temperature_map.rb | \
+  sort | ch02/src/main/ruby/max_temperature_reduce.rb
 : ^^ max_temp_ruby_pipeline
 : vv max_temp_python_pipeline
-cat input/ncdc/sample.txt | src/main/ch02/python/max_temperature_map.py | \
-  sort | src/main/ch02/python/max_temperature_reduce.py
+cat input/ncdc/sample.txt | ch02/src/main/python/max_temperature_map.py | \
+  sort | ch02/src/main/python/max_temperature_reduce.py
 : ^^ max_temp_python_pipeline
 
diff --git a/src/main/ch03/java/CoherencyModelTest.java → ch03/src/main/java/CoherencyModelTest.java b/src/main/ch03/java/CoherencyModelTest.java → ch03/src/main/java/CoherencyModelTest.java
diff --git a/src/main/ch03/java/FileCopyWithProgress.java → ch03/src/main/java/FileCopyWithProgress.java b/src/main/ch03/java/FileCopyWithProgress.java → ch03/src/main/java/FileCopyWithProgress.java
diff --git a/src/main/ch03/java/FileSystemCat.java → ch03/src/main/java/FileSystemCat.java b/src/main/ch03/java/FileSystemCat.java → ch03/src/main/java/FileSystemCat.java
diff --git a/src/main/ch03/java/FileSystemDoubleCat.java → ch03/src/main/java/FileSystemDoubleCat.java b/src/main/ch03/java/FileSystemDoubleCat.java → ch03/src/main/java/FileSystemDoubleCat.java
diff --git a/src/main/ch03/java/ListStatus.java → ch03/src/main/java/ListStatus.java b/src/main/ch03/java/ListStatus.java → ch03/src/main/java/ListStatus.java
diff --git a/...ain/ch03/java/RegexExcludePathFilter.java → ...src/main/java/RegexExcludePathFilter.java b/...ain/ch03/java/RegexExcludePathFilter.java → ...src/main/java/RegexExcludePathFilter.java
diff --git a/src/main/ch03/java/ShowFileStatusTest.java → ch03/src/main/java/ShowFileStatusTest.java b/src/main/ch03/java/ShowFileStatusTest.java → ch03/src/main/java/ShowFileStatusTest.java
diff --git a/src/main/ch03/java/URLCat.java → ch03/src/main/java/URLCat.java b/src/main/ch03/java/URLCat.java → ch03/src/main/java/URLCat.java
diff --git a/src/main/ch03/resources/core-site.xml → ch03/src/main/resources/core-site.xml b/src/main/ch03/resources/core-site.xml → ch03/src/main/resources/core-site.xml
diff --git a/src/main/ch03/resources/hdfs-site.xml → ch03/src/main/resources/hdfs-site.xml b/src/main/ch03/resources/hdfs-site.xml → ch03/src/main/resources/hdfs-site.xml
diff --git a/src/main/ch03/sh/file.sh → ch03/src/main/sh/file.sh b/src/main/ch03/sh/file.sh → ch03/src/main/sh/file.sh
diff --git a/src/main/ch03/sh/hars.sh → ch03/src/main/sh/hars.sh b/src/main/ch03/sh/hars.sh → ch03/src/main/sh/hars.sh
diff --git a/.../examples/FileDecompressor.java.input.txt → .../examples/FileDecompressor.java.input.txt b/.../examples/FileDecompressor.java.input.txt → .../examples/FileDecompressor.java.input.txt
diff --git a/...ch04/examples/MapFile-data-head.input.txt → ...main/examples/MapFile-data-head.input.txt b/...ch04/examples/MapFile-data-head.input.txt → ...main/examples/MapFile-data-head.input.txt
diff --git a/...h04/examples/MapFile-data-head.output.txt → ...ain/examples/MapFile-data-head.output.txt b/...h04/examples/MapFile-data-head.output.txt → ...ain/examples/MapFile-data-head.output.txt
diff --git a/...ain/ch04/examples/MapFile-index.input.txt → ...src/main/examples/MapFile-index.input.txt b/...ain/ch04/examples/MapFile-index.input.txt → ...src/main/examples/MapFile-index.input.txt
diff --git a/...in/ch04/examples/MapFile-index.output.txt → ...rc/main/examples/MapFile-index.output.txt b/...in/ch04/examples/MapFile-index.output.txt → ...rc/main/examples/MapFile-index.output.txt
diff --git a/src/main/ch04/examples/MapFile-ls.input.txt → ch04/src/main/examples/MapFile-ls.input.txt b/src/main/ch04/examples/MapFile-ls.input.txt → ch04/src/main/examples/MapFile-ls.input.txt
diff --git a/src/main/ch04/examples/MapFile-ls.output.txt → ch04/src/main/examples/MapFile-ls.output.txt b/src/main/ch04/examples/MapFile-ls.output.txt → ch04/src/main/examples/MapFile-ls.output.txt
diff --git a/.../examples/MapFileWriteDemo.java.input.txt → .../examples/MapFileWriteDemo.java.input.txt b/.../examples/MapFileWriteDemo.java.input.txt → .../examples/MapFileWriteDemo.java.input.txt
diff --git a/...TemperatureWithCompression.java.input.txt → ...TemperatureWithCompression.java.input.txt b/...TemperatureWithCompression.java.input.txt → ...TemperatureWithCompression.java.input.txt
diff --git a/...MaxTemperatureWithCompression.java.pre.sh → ...MaxTemperatureWithCompression.java.pre.sh b/...MaxTemperatureWithCompression.java.pre.sh → ...MaxTemperatureWithCompression.java.pre.sh
diff --git a/.../SequenceFileMapReduceSort.java.input.txt → .../SequenceFileMapReduceSort.java.input.txt b/.../SequenceFileMapReduceSort.java.input.txt → .../SequenceFileMapReduceSort.java.input.txt
diff --git a/...ceFileMapReduceSortResults.java.input.txt → ...ceFileMapReduceSortResults.java.input.txt b/...ceFileMapReduceSortResults.java.input.txt → ...ceFileMapReduceSortResults.java.input.txt
diff --git a/...eFileMapReduceSortResults.java.output.txt → ...eFileMapReduceSortResults.java.output.txt b/...eFileMapReduceSortResults.java.output.txt → ...eFileMapReduceSortResults.java.output.txt
diff --git a/...uenceFileMapReduceSortResults.java.pre.sh → ...uenceFileMapReduceSortResults.java.pre.sh b/...uenceFileMapReduceSortResults.java.pre.sh → ...uenceFileMapReduceSortResults.java.pre.sh
diff --git a/...mples/SequenceFileReadDemo.java.input.txt → ...mples/SequenceFileReadDemo.java.input.txt b/...mples/SequenceFileReadDemo.java.input.txt → ...mples/SequenceFileReadDemo.java.input.txt
diff --git a/...ples/SequenceFileReadDemo.java.output.txt → ...ples/SequenceFileReadDemo.java.output.txt b/...ples/SequenceFileReadDemo.java.output.txt → ...ples/SequenceFileReadDemo.java.output.txt
diff --git a/...examples/SequenceFileReadDemo.java.pre.sh → ...examples/SequenceFileReadDemo.java.pre.sh b/...examples/SequenceFileReadDemo.java.pre.sh → ...examples/SequenceFileReadDemo.java.pre.sh
diff --git a/...FileToMapFileConverter-fix.java.input.txt → ...FileToMapFileConverter-fix.java.input.txt b/...FileToMapFileConverter-fix.java.input.txt → ...FileToMapFileConverter-fix.java.input.txt
diff --git a/...eFileToMapFileConverter-mv.java.input.txt → ...eFileToMapFileConverter-mv.java.input.txt b/...eFileToMapFileConverter-mv.java.input.txt → ...eFileToMapFileConverter-mv.java.input.txt
diff --git a/...ileToMapFileConverter-sort.java.input.txt → ...ileToMapFileConverter-sort.java.input.txt b/...ileToMapFileConverter-sort.java.input.txt → ...ileToMapFileConverter-sort.java.input.txt
diff --git a/...ples/SequenceFileWriteDemo.java.input.txt → ...ples/SequenceFileWriteDemo.java.input.txt b/...ples/SequenceFileWriteDemo.java.input.txt → ...ples/SequenceFileWriteDemo.java.input.txt
diff --git a/...les/SequenceFileWriteDemo.java.output.txt → ...les/SequenceFileWriteDemo.java.output.txt b/...les/SequenceFileWriteDemo.java.output.txt → ...les/SequenceFileWriteDemo.java.output.txt
diff --git a/.../examples/StreamCompressor.java.input.txt → .../examples/StreamCompressor.java.input.txt b/.../examples/StreamCompressor.java.input.txt → .../examples/StreamCompressor.java.input.txt
diff --git a/...examples/StreamCompressor.java.output.txt → ...examples/StreamCompressor.java.output.txt b/...examples/StreamCompressor.java.output.txt → ...examples/StreamCompressor.java.output.txt
diff --git a/...ch04/examples/TextIterator.java.input.txt → ...main/examples/TextIterator.java.input.txt b/...ch04/examples/TextIterator.java.input.txt → ...main/examples/TextIterator.java.input.txt
diff --git a/...h04/examples/TextIterator.java.output.txt → ...ain/examples/TextIterator.java.output.txt b/...h04/examples/TextIterator.java.output.txt → ...ain/examples/TextIterator.java.output.txt
diff --git a/...in/ch04/examples/hadoop-fs-text.input.txt → ...rc/main/examples/hadoop-fs-text.input.txt b/...in/ch04/examples/hadoop-fs-text.input.txt → ...rc/main/examples/hadoop-fs-text.input.txt
diff --git a/...n/ch04/examples/hadoop-fs-text.output.txt → ...c/main/examples/hadoop-fs-text.output.txt b/...n/ch04/examples/hadoop-fs-text.output.txt → ...c/main/examples/hadoop-fs-text.output.txt
diff --git a/src/main/ch04/java/ArrayWritableTest.java → ch04/src/main/java/ArrayWritableTest.java b/src/main/ch04/java/ArrayWritableTest.java → ch04/src/main/java/ArrayWritableTest.java
diff --git a/src/main/ch04/java/BytesWritableTest.java → ch04/src/main/java/BytesWritableTest.java b/src/main/ch04/java/BytesWritableTest.java → ch04/src/main/java/BytesWritableTest.java
diff --git a/src/main/ch04/java/FileDecompressor.java → ch04/src/main/java/FileDecompressor.java b/src/main/ch04/java/FileDecompressor.java → ch04/src/main/java/FileDecompressor.java
diff --git a/src/main/ch04/java/IntPair.java → ch04/src/main/java/IntPair.java b/src/main/ch04/java/IntPair.java → ch04/src/main/java/IntPair.java
diff --git a/src/main/ch04/java/IntWritableTest.java → ch04/src/main/java/IntWritableTest.java b/src/main/ch04/java/IntWritableTest.java → ch04/src/main/java/IntWritableTest.java
diff --git a/src/main/ch04/java/MapFileFixer.java → ch04/src/main/java/MapFileFixer.java b/src/main/ch04/java/MapFileFixer.java → ch04/src/main/java/MapFileFixer.java
diff --git a/src/main/ch04/java/MapFileSeekTest.java → ch04/src/main/java/MapFileSeekTest.java b/src/main/ch04/java/MapFileSeekTest.java → ch04/src/main/java/MapFileSeekTest.java
diff --git a/src/main/ch04/java/MapFileWriteDemo.java → ch04/src/main/java/MapFileWriteDemo.java b/src/main/ch04/java/MapFileWriteDemo.java → ch04/src/main/java/MapFileWriteDemo.java
diff --git a/src/main/ch04/java/MapWritableTest.java → ch04/src/main/java/MapWritableTest.java b/src/main/ch04/java/MapWritableTest.java → ch04/src/main/java/MapWritableTest.java
diff --git a/...4/java/MaxTemperatureWithCompression.java → ...n/java/MaxTemperatureWithCompression.java b/...4/java/MaxTemperatureWithCompression.java → ...n/java/MaxTemperatureWithCompression.java
diff --git a/...xTemperatureWithMapOutputCompression.java → ...xTemperatureWithMapOutputCompression.java b/...xTemperatureWithMapOutputCompression.java → ...xTemperatureWithMapOutputCompression.java
diff --git a/...ain/ch04/java/PooledStreamCompressor.java → ...src/main/java/PooledStreamCompressor.java b/...ain/ch04/java/PooledStreamCompressor.java → ...src/main/java/PooledStreamCompressor.java
diff --git a/src/main/ch04/java/SequenceFileReadDemo.java → ch04/src/main/java/SequenceFileReadDemo.java b/src/main/ch04/java/SequenceFileReadDemo.java → ch04/src/main/java/SequenceFileReadDemo.java
diff --git a/...h04/java/SequenceFileSeekAndSyncTest.java → ...ain/java/SequenceFileSeekAndSyncTest.java b/...h04/java/SequenceFileSeekAndSyncTest.java → ...ain/java/SequenceFileSeekAndSyncTest.java
diff --git a/...main/ch04/java/SequenceFileWriteDemo.java → .../src/main/java/SequenceFileWriteDemo.java b/...main/ch04/java/SequenceFileWriteDemo.java → .../src/main/java/SequenceFileWriteDemo.java
diff --git a/src/main/ch04/java/StreamCompressor.java → ch04/src/main/java/StreamCompressor.java b/src/main/ch04/java/StreamCompressor.java → ch04/src/main/java/StreamCompressor.java
diff --git a/...n/ch04/java/StringTextComparisonTest.java → ...c/main/java/StringTextComparisonTest.java b/...n/ch04/java/StringTextComparisonTest.java → ...c/main/java/StringTextComparisonTest.java
diff --git a/src/main/ch04/java/TextArrayWritable.java → ch04/src/main/java/TextArrayWritable.java b/src/main/ch04/java/TextArrayWritable.java → ch04/src/main/java/TextArrayWritable.java
diff --git a/src/main/ch04/java/TextIterator.java → ch04/src/main/java/TextIterator.java b/src/main/ch04/java/TextIterator.java → ch04/src/main/java/TextIterator.java
diff --git a/src/main/ch04/java/TextPair.java → ch04/src/main/java/TextPair.java b/src/main/ch04/java/TextPair.java → ch04/src/main/java/TextPair.java
diff --git a/src/main/ch04/java/TextTest.java → ch04/src/main/java/TextTest.java b/src/main/ch04/java/TextTest.java → ch04/src/main/java/TextTest.java
diff --git a/src/main/ch04/java/VIntWritableTest.java → ch04/src/main/java/VIntWritableTest.java b/src/main/ch04/java/VIntWritableTest.java → ch04/src/main/java/VIntWritableTest.java
diff --git a/src/main/ch04/java/WritableTestBase.java → ch04/src/main/java/WritableTestBase.java b/src/main/ch04/java/WritableTestBase.java → ch04/src/main/java/WritableTestBase.java
diff --git a/...ConfigurationPrinterSystem.java.input.txt → ...ConfigurationPrinterSystem.java.input.txt b/...ConfigurationPrinterSystem.java.input.txt → ...ConfigurationPrinterSystem.java.input.txt
diff --git a/...nfigurationPrinterWithConf.java.input.txt → ...nfigurationPrinterWithConf.java.input.txt b/...nfigurationPrinterWithConf.java.input.txt → ...nfigurationPrinterWithConf.java.input.txt
diff --git a/...figurationPrinterWithConf.java.output.txt → ...figurationPrinterWithConf.java.output.txt b/...figurationPrinterWithConf.java.output.txt → ...figurationPrinterWithConf.java.output.txt
diff --git a/...urationPrinterWithConfAndD.java.input.txt → ...urationPrinterWithConfAndD.java.input.txt b/...urationPrinterWithConfAndD.java.input.txt → ...urationPrinterWithConfAndD.java.input.txt
diff --git a/.../ConfigurationPrinterWithD.java.input.txt → .../ConfigurationPrinterWithD.java.input.txt b/.../ConfigurationPrinterWithD.java.input.txt → .../ConfigurationPrinterWithD.java.input.txt
diff --git a/...ConfigurationPrinterWithD.java.output.txt → ...ConfigurationPrinterWithD.java.output.txt b/...ConfigurationPrinterWithD.java.output.txt → ...ConfigurationPrinterWithD.java.output.txt
diff --git a/...mples/MaxTemperatureDriver.java.input.txt → ...mples/MaxTemperatureDriver.java.input.txt b/...mples/MaxTemperatureDriver.java.input.txt → ...mples/MaxTemperatureDriver.java.input.txt
diff --git a/.../MaxTemperatureDriverLocal.java.input.txt → .../MaxTemperatureDriverLocal.java.input.txt b/.../MaxTemperatureDriverLocal.java.input.txt → .../MaxTemperatureDriverLocal.java.input.txt
diff --git a/...xTemperatureDriverLocalGOP.java.input.txt → ...xTemperatureDriverLocalGOP.java.input.txt b/...xTemperatureDriverLocalGOP.java.input.txt → ...xTemperatureDriverLocalGOP.java.input.txt
diff --git a/src/main/ch05/java/ConfigurationPrinter.java → ch05/src/main/java/ConfigurationPrinter.java b/src/main/ch05/java/ConfigurationPrinter.java → ch05/src/main/java/ConfigurationPrinter.java
diff --git a/...va/MultipleResourceConfigurationTest.java → ...va/MultipleResourceConfigurationTest.java b/...va/MultipleResourceConfigurationTest.java → ...va/MultipleResourceConfigurationTest.java
diff --git a/...java/SingleResourceConfigurationTest.java → ...java/SingleResourceConfigurationTest.java b/...java/SingleResourceConfigurationTest.java → ...java/SingleResourceConfigurationTest.java
diff --git a/src/main/ch05/java/configuration-1.xml → ch05/src/main/java/configuration-1.xml b/src/main/ch05/java/configuration-1.xml → ch05/src/main/java/configuration-1.xml
diff --git a/src/main/ch05/java/configuration-2.xml → ch05/src/main/java/configuration-2.xml b/src/main/ch05/java/configuration-2.xml → ch05/src/main/java/configuration-2.xml
diff --git a/...in/ch05/java/v1/MaxTemperatureMapper.java → ...rc/main/java/v1/MaxTemperatureMapper.java b/...in/ch05/java/v1/MaxTemperatureMapper.java → ...rc/main/java/v1/MaxTemperatureMapper.java
diff --git a/...h05/java/v1/MaxTemperatureMapperTest.java → ...ain/java/v1/MaxTemperatureMapperTest.java b/...h05/java/v1/MaxTemperatureMapperTest.java → ...ain/java/v1/MaxTemperatureMapperTest.java
diff --git a/...n/ch05/java/v1/MaxTemperatureReducer.java → ...c/main/java/v1/MaxTemperatureReducer.java b/...n/ch05/java/v1/MaxTemperatureReducer.java → ...c/main/java/v1/MaxTemperatureReducer.java
diff --git a/...05/java/v1/MaxTemperatureReducerTest.java → ...in/java/v1/MaxTemperatureReducerTest.java b/...05/java/v1/MaxTemperatureReducerTest.java → ...in/java/v1/MaxTemperatureReducerTest.java
diff --git a/...in/ch05/java/v2/MaxTemperatureDriver.java → ...rc/main/java/v2/MaxTemperatureDriver.java b/...in/ch05/java/v2/MaxTemperatureDriver.java → ...rc/main/java/v2/MaxTemperatureDriver.java
diff --git a/...in/ch05/java/v2/MaxTemperatureMapper.java → ...rc/main/java/v2/MaxTemperatureMapper.java b/...in/ch05/java/v2/MaxTemperatureMapper.java → ...rc/main/java/v2/MaxTemperatureMapper.java
diff --git a/...h05/java/v2/MaxTemperatureMapperTest.java → ...ain/java/v2/MaxTemperatureMapperTest.java b/...h05/java/v2/MaxTemperatureMapperTest.java → ...ain/java/v2/MaxTemperatureMapperTest.java
diff --git a/...in/ch05/java/v3/MaxTemperatureDriver.java → ...rc/main/java/v3/MaxTemperatureDriver.java b/...in/ch05/java/v3/MaxTemperatureDriver.java → ...rc/main/java/v3/MaxTemperatureDriver.java
diff --git a/...java/v3/MaxTemperatureDriverMiniTest.java → ...java/v3/MaxTemperatureDriverMiniTest.java b/...java/v3/MaxTemperatureDriverMiniTest.java → ...java/v3/MaxTemperatureDriverMiniTest.java
diff --git a/...h05/java/v3/MaxTemperatureDriverTest.java → ...ain/java/v3/MaxTemperatureDriverTest.java b/...h05/java/v3/MaxTemperatureDriverTest.java → ...ain/java/v3/MaxTemperatureDriverTest.java
diff --git a/...in/ch05/java/v3/MaxTemperatureMapper.java → ...rc/main/java/v3/MaxTemperatureMapper.java b/...in/ch05/java/v3/MaxTemperatureMapper.java → ...rc/main/java/v3/MaxTemperatureMapper.java
diff --git a/...h05/java/v3/MaxTemperatureMapperTest.java → ...ain/java/v3/MaxTemperatureMapperTest.java b/...h05/java/v3/MaxTemperatureMapperTest.java → ...ain/java/v3/MaxTemperatureMapperTest.java
diff --git a/src/main/ch05/java/v3/NcdcRecordParser.java → ch05/src/main/java/v3/NcdcRecordParser.java b/src/main/ch05/java/v3/NcdcRecordParser.java → ch05/src/main/java/v3/NcdcRecordParser.java
diff --git a/src/main/ch05/java/v3/expected.txt → ch05/src/main/java/v3/expected.txt b/src/main/ch05/java/v3/expected.txt → ch05/src/main/java/v3/expected.txt
diff --git a/...in/ch05/java/v4/MaxTemperatureDriver.java → ...rc/main/java/v4/MaxTemperatureDriver.java b/...in/ch05/java/v4/MaxTemperatureDriver.java → ...rc/main/java/v4/MaxTemperatureDriver.java
diff --git a/...in/ch05/java/v4/MaxTemperatureMapper.java → ...rc/main/java/v4/MaxTemperatureMapper.java b/...in/ch05/java/v4/MaxTemperatureMapper.java → ...rc/main/java/v4/MaxTemperatureMapper.java
diff --git a/...in/ch05/java/v5/MaxTemperatureDriver.java → ...rc/main/java/v5/MaxTemperatureDriver.java b/...in/ch05/java/v5/MaxTemperatureDriver.java → ...rc/main/java/v5/MaxTemperatureDriver.java
diff --git a/...in/ch05/java/v5/MaxTemperatureMapper.java → ...rc/main/java/v5/MaxTemperatureMapper.java b/...in/ch05/java/v5/MaxTemperatureMapper.java → ...rc/main/java/v5/MaxTemperatureMapper.java
diff --git a/...h05/java/v5/MaxTemperatureMapperTest.java → ...ain/java/v5/MaxTemperatureMapperTest.java b/...h05/java/v5/MaxTemperatureMapperTest.java → ...ain/java/v5/MaxTemperatureMapperTest.java
diff --git a/src/main/ch05/java/v5/NcdcRecordParser.java → ch05/src/main/java/v5/NcdcRecordParser.java b/src/main/ch05/java/v5/NcdcRecordParser.java → ch05/src/main/java/v5/NcdcRecordParser.java
diff --git a/...in/ch05/java/v6/MaxTemperatureDriver.java → ...rc/main/java/v6/MaxTemperatureDriver.java b/...in/ch05/java/v6/MaxTemperatureDriver.java → ...rc/main/java/v6/MaxTemperatureDriver.java
diff --git a/...in/ch05/java/v7/MaxTemperatureDriver.java → ...rc/main/java/v7/MaxTemperatureDriver.java b/...in/ch05/java/v7/MaxTemperatureDriver.java → ...rc/main/java/v7/MaxTemperatureDriver.java
diff --git a/...in/ch05/java/v7/MaxTemperatureMapper.java → ...rc/main/java/v7/MaxTemperatureMapper.java b/...in/ch05/java/v7/MaxTemperatureMapper.java → ...rc/main/java/v7/MaxTemperatureMapper.java
diff --git a/...nUsingMultipleOutputFormat.java.input.txt → ...nUsingMultipleOutputFormat.java.input.txt b/...nUsingMultipleOutputFormat.java.input.txt → ...nUsingMultipleOutputFormat.java.input.txt
diff --git a/...xTemperatureWithMultipleInputFormats.java → ...xTemperatureWithMultipleInputFormats.java b/...xTemperatureWithMultipleInputFormats.java → ...xTemperatureWithMultipleInputFormats.java
diff --git a/src/main/ch06/java/MinimalMapReduce.java → ch06/src/main/java/MinimalMapReduce.java b/src/main/ch06/java/MinimalMapReduce.java → ch06/src/main/java/MinimalMapReduce.java
diff --git a/...06/java/MinimalMapReduceWithDefaults.java → ...in/java/MinimalMapReduceWithDefaults.java b/...06/java/MinimalMapReduceWithDefaults.java → ...in/java/MinimalMapReduceWithDefaults.java
diff --git a/...n/ch06/java/MissingTemperatureFields.java → ...c/main/java/MissingTemperatureFields.java b/...n/ch06/java/MissingTemperatureFields.java → ...c/main/java/MissingTemperatureFields.java
diff --git a/...06/java/NonSplittableTextInputFormat.java → ...in/java/NonSplittableTextInputFormat.java b/...06/java/NonSplittableTextInputFormat.java → ...in/java/NonSplittableTextInputFormat.java
diff --git a/...onByStationUsingMultipleOutputFormat.java → ...onByStationUsingMultipleOutputFormat.java b/...onByStationUsingMultipleOutputFormat.java → ...onByStationUsingMultipleOutputFormat.java
diff --git a/...rtitionByStationUsingMultipleOutputs.java → ...rtitionByStationUsingMultipleOutputs.java b/...rtitionByStationUsingMultipleOutputs.java → ...rtitionByStationUsingMultipleOutputs.java
diff --git a/...StationYearUsingMultipleOutputFormat.java → ...StationYearUsingMultipleOutputFormat.java b/...StationYearUsingMultipleOutputFormat.java → ...StationYearUsingMultipleOutputFormat.java
diff --git a/...va/SmallFilesToSequenceFileConverter.java → ...va/SmallFilesToSequenceFileConverter.java b/...va/SmallFilesToSequenceFileConverter.java → ...va/SmallFilesToSequenceFileConverter.java
diff --git a/src/main/ch06/java/StationPartitioner.java → ch06/src/main/java/StationPartitioner.java b/src/main/ch06/java/StationPartitioner.java → ch06/src/main/java/StationPartitioner.java
diff --git a/src/main/ch06/java/WholeFileInputFormat.java → ch06/src/main/java/WholeFileInputFormat.java b/src/main/ch06/java/WholeFileInputFormat.java → ch06/src/main/java/WholeFileInputFormat.java
diff --git a/...main/ch06/java/WholeFileRecordReader.java → .../src/main/java/WholeFileRecordReader.java b/...main/ch06/java/WholeFileRecordReader.java → .../src/main/java/WholeFileRecordReader.java
diff --git a/src/main/ch06/sh/streaming.sh → ch06/src/main/sh/streaming.sh b/src/main/ch06/sh/streaming.sh → ch06/src/main/sh/streaming.sh
diff --git a/.../examples/MinimalMapReduce.java.input.txt → .../examples/MinimalMapReduce.java.input.txt b/.../examples/MinimalMapReduce.java.input.txt → .../examples/MinimalMapReduce.java.input.txt
diff --git a/...lesToSequenceFileConverter.java.input.txt → ...lesToSequenceFileConverter.java.input.txt b/...lesToSequenceFileConverter.java.input.txt → ...lesToSequenceFileConverter.java.input.txt
diff --git a/...ch07/examples/default_streaming.input.txt → ...main/examples/default_streaming.input.txt b/...ch07/examples/default_streaming.input.txt → ...main/examples/default_streaming.input.txt
diff --git a/...ch07/examples/minimal_streaming.input.txt → ...main/examples/minimal_streaming.input.txt b/...ch07/examples/minimal_streaming.input.txt → ...main/examples/minimal_streaming.input.txt
diff --git a/.../LookupRecordByTemperature.java.input.txt → .../LookupRecordByTemperature.java.input.txt b/.../LookupRecordByTemperature.java.input.txt → .../LookupRecordByTemperature.java.input.txt
diff --git a/...LookupRecordByTemperature.java.output.txt → ...LookupRecordByTemperature.java.output.txt b/...LookupRecordByTemperature.java.output.txt → ...LookupRecordByTemperature.java.output.txt
diff --git a/...LookupRecordsByTemperature.java.input.txt → ...LookupRecordsByTemperature.java.input.txt b/...LookupRecordsByTemperature.java.input.txt → ...LookupRecordsByTemperature.java.input.txt
diff --git a/...ookupRecordsByTemperature.java.output.txt → ...ookupRecordsByTemperature.java.output.txt b/...ookupRecordsByTemperature.java.output.txt → ...ookupRecordsByTemperature.java.output.txt
diff --git a/...eUsingDistributedCacheFile.java.input.txt → ...eUsingDistributedCacheFile.java.input.txt b/...eUsingDistributedCacheFile.java.input.txt → ...eUsingDistributedCacheFile.java.input.txt
diff --git a/...MaxTemperatureWithCounters.java.input.txt → ...MaxTemperatureWithCounters.java.input.txt b/...MaxTemperatureWithCounters.java.input.txt → ...MaxTemperatureWithCounters.java.input.txt
diff --git a/...s/MissingTemperatureFields.java.input.txt → ...s/MissingTemperatureFields.java.input.txt b/...s/MissingTemperatureFields.java.input.txt → ...s/MissingTemperatureFields.java.input.txt
diff --git a/...ratureUsingHashPartitioner.java.input.txt → ...ratureUsingHashPartitioner.java.input.txt b/...ratureUsingHashPartitioner.java.input.txt → ...ratureUsingHashPartitioner.java.input.txt
diff --git a/...UsingTotalOrderPartitioner.java.input.txt → ...UsingTotalOrderPartitioner.java.input.txt b/...UsingTotalOrderPartitioner.java.input.txt → ...UsingTotalOrderPartitioner.java.input.txt
diff --git a/...mples/SortDataPreprocessor.java.input.txt → ...mples/SortDataPreprocessor.java.input.txt b/...mples/SortDataPreprocessor.java.input.txt → ...mples/SortDataPreprocessor.java.input.txt
diff --git a/src/main/ch08/java/JoinRecordMapper.java → ch08/src/main/java/JoinRecordMapper.java b/src/main/ch08/java/JoinRecordMapper.java → ch08/src/main/java/JoinRecordMapper.java
diff --git a/.../ch08/java/JoinRecordWithStationName.java → .../main/java/JoinRecordWithStationName.java b/.../ch08/java/JoinRecordWithStationName.java → .../main/java/JoinRecordWithStationName.java
diff --git a/src/main/ch08/java/JoinReducer.java → ch08/src/main/java/JoinReducer.java b/src/main/ch08/java/JoinReducer.java → ch08/src/main/java/JoinReducer.java
diff --git a/src/main/ch08/java/JoinStationMapper.java → ch08/src/main/java/JoinStationMapper.java b/src/main/ch08/java/JoinStationMapper.java → ch08/src/main/java/JoinStationMapper.java
diff --git a/.../ch08/java/LookupRecordByTemperature.java → .../main/java/LookupRecordByTemperature.java b/.../ch08/java/LookupRecordByTemperature.java → .../main/java/LookupRecordByTemperature.java
diff --git a/...ch08/java/LookupRecordsByTemperature.java → ...main/java/LookupRecordsByTemperature.java b/...ch08/java/LookupRecordsByTemperature.java → ...main/java/LookupRecordsByTemperature.java
diff --git a/...StationNameUsingDistributedCacheFile.java → ...StationNameUsingDistributedCacheFile.java b/...StationNameUsingDistributedCacheFile.java → ...StationNameUsingDistributedCacheFile.java
diff --git a/...ava/MaxTemperatureUsingSecondarySort.java → ...ava/MaxTemperatureUsingSecondarySort.java b/...ava/MaxTemperatureUsingSecondarySort.java → ...ava/MaxTemperatureUsingSecondarySort.java
diff --git a/...ch08/java/MaxTemperatureWithCounters.java → ...main/java/MaxTemperatureWithCounters.java b/...ch08/java/MaxTemperatureWithCounters.java → ...main/java/MaxTemperatureWithCounters.java
diff --git a/...ratureWithCounters_Temperature.properties → ...ratureWithCounters_Temperature.properties b/...ratureWithCounters_Temperature.properties → ...ratureWithCounters_Temperature.properties
diff --git a/...ch08/java/SortByTemperatureToMapFile.java → ...main/java/SortByTemperatureToMapFile.java b/...ch08/java/SortByTemperatureToMapFile.java → ...main/java/SortByTemperatureToMapFile.java
diff --git a/...ortByTemperatureUsingHashPartitioner.java → ...ortByTemperatureUsingHashPartitioner.java b/...ortByTemperatureUsingHashPartitioner.java → ...ortByTemperatureUsingHashPartitioner.java
diff --git a/...emperatureUsingTotalOrderPartitioner.java → ...emperatureUsingTotalOrderPartitioner.java b/...emperatureUsingTotalOrderPartitioner.java → ...emperatureUsingTotalOrderPartitioner.java
diff --git a/src/main/ch08/java/SortDataPreprocessor.java → ch08/src/main/java/SortDataPreprocessor.java b/src/main/ch08/java/SortDataPreprocessor.java → ch08/src/main/java/SortDataPreprocessor.java
diff --git a/...in/ch08/java/TemperatureDistribution.java → ...rc/main/java/TemperatureDistribution.java b/...in/ch08/java/TemperatureDistribution.java → ...rc/main/java/TemperatureDistribution.java
diff --git a/src/main/ch08/python/max_daily_temp_map.py → ch08/src/main/python/max_daily_temp_map.py b/src/main/ch08/python/max_daily_temp_map.py → ch08/src/main/python/max_daily_temp_map.py
diff --git a/...main/ch08/python/max_daily_temp_reduce.py → .../src/main/python/max_daily_temp_reduce.py b/...main/ch08/python/max_daily_temp_reduce.py → .../src/main/python/max_daily_temp_reduce.py
diff --git a/ch08/src/main/python/mean_max_daily_temp.sh b/ch08/src/main/python/mean_max_daily_temp.sh
@@ -0,0 +1,20 @@
+STREAM="hadoop jar $HADOOP_INSTALL/contrib/streaming/hadoop-*-streaming.jar -conf conf/hadoop-localhost.xml"
+
+$STREAM \
+  -D stream.num.map.output.key.fields=2 \
+  -input input/ncdc/all \
+  -output out_max_daily \
+  -mapper ch08/src/main/python/max_daily_temp_map.py \
+  -reducer ch08/src/main/python/max_daily_temp_reduce.py \
+  -file ch08/src/main/python/max_daily_temp_map.py \
+  -file ch08/src/main/python/max_daily_temp_reduce.py
+
+$STREAM \
+  -D stream.num.map.output.key.fields=2 \
+  -input out_max_daily \
+  -output out_mean_max_daily \
+  -mapper ch08/src/main/python/mean_max_daily_temp_map.py \
+  -reducer ch08/src/main/python/mean_max_daily_temp_reduce.py \
+  -file ch08/src/main/python/mean_max_daily_temp_map.py \
+  -file ch08/src/main/python/mean_max_daily_temp_reduce.py
+
diff --git a/...in/ch08/python/mean_max_daily_temp_map.py → ...rc/main/python/mean_max_daily_temp_map.py b/...in/ch08/python/mean_max_daily_temp_map.py → ...rc/main/python/mean_max_daily_temp_map.py
diff --git a/...ch08/python/mean_max_daily_temp_reduce.py → ...main/python/mean_max_daily_temp_reduce.py b/...ch08/python/mean_max_daily_temp_reduce.py → ...main/python/mean_max_daily_temp_reduce.py
diff --git a/src/main/ch08/python/secondary_sort.sh → ch08/src/main/python/secondary_sort.sh b/src/main/ch08/python/secondary_sort.sh → ch08/src/main/python/secondary_sort.sh
@@ -6,9 +6,9 @@ org.apache.hadoop.mapred.lib.KeyFieldBasedComparator \
   -D mapred.text.key.comparator.options="-k1n -k2nr" \
   -input input/ncdc/all \
   -output output_secondarysort_streaming \
-  -mapper src/main/ch08/python/secondary_sort_map.py \
+  -mapper ch08/src/main/python/secondary_sort_map.py \
   -partitioner org.apache.hadoop.mapred.lib.KeyFieldBasedPartitioner \
-  -reducer src/main/ch08/python/secondary_sort_reduce.py \
-  -file src/main/ch08/python/secondary_sort_map.py \
-  -file src/main/ch08/python/secondary_sort_reduce.py
+  -reducer ch08/src/main/python/secondary_sort_reduce.py \
+  -file ch08/src/main/python/secondary_sort_map.py \
+  -file ch08/src/main/python/secondary_sort_reduce.py
 
diff --git a/src/main/ch08/python/secondary_sort_map.py → ch08/src/main/python/secondary_sort_map.py b/src/main/ch08/python/secondary_sort_map.py → ch08/src/main/python/secondary_sort_map.py
diff --git a/...main/ch08/python/secondary_sort_reduce.py → .../src/main/python/secondary_sort_reduce.py b/...main/ch08/python/secondary_sort_reduce.py → .../src/main/python/secondary_sort_reduce.py
diff --git a/src/main/ch08/r/fixed-partitions → ch08/src/main/r/fixed-partitions b/src/main/ch08/r/fixed-partitions → ch08/src/main/r/fixed-partitions
diff --git a/src/main/ch08/r/output → ch08/src/main/r/output b/src/main/ch08/r/output → ch08/src/main/r/output
diff --git a/src/main/ch08/r/output_sorted → ch08/src/main/r/output_sorted b/src/main/ch08/r/output_sorted → ch08/src/main/r/output_sorted
diff --git a/src/main/ch08/r/sampled-partitions → ch08/src/main/r/sampled-partitions b/src/main/ch08/r/sampled-partitions → ch08/src/main/r/sampled-partitions
diff --git a/src/main/ch08/r/temperature_distribution.png → ch08/src/main/r/temperature_distribution.png b/src/main/ch08/r/temperature_distribution.png → ch08/src/main/r/temperature_distribution.png
diff --git a/src/main/ch08/r/temperature_distribution.r → ch08/src/main/r/temperature_distribution.r b/src/main/ch08/r/temperature_distribution.r → ch08/src/main/r/temperature_distribution.r
diff --git a/src/main/ch09/conf/core-site.xml → ch09/src/main/conf/core-site.xml b/src/main/ch09/conf/core-site.xml → ch09/src/main/conf/core-site.xml
diff --git a/src/main/ch09/conf/hdfs-site.xml → ch09/src/main/conf/hdfs-site.xml b/src/main/ch09/conf/hdfs-site.xml → ch09/src/main/conf/hdfs-site.xml
diff --git a/src/main/ch09/conf/mapred-site.xml → ch09/src/main/conf/mapred-site.xml b/src/main/ch09/conf/mapred-site.xml → ch09/src/main/conf/mapred-site.xml
diff --git a/src/main/ch09/sh/trash.sh → ch09/src/main/sh/trash.sh b/src/main/ch09/sh/trash.sh → ch09/src/main/sh/trash.sh
diff --git a/src/main/ch11/grunt/combine.grunt → ch11/src/main/grunt/combine.grunt b/src/main/ch11/grunt/combine.grunt → ch11/src/main/grunt/combine.grunt
diff --git a/src/main/ch11/grunt/foreach.grunt → ch11/src/main/grunt/foreach.grunt b/src/main/ch11/grunt/foreach.grunt → ch11/src/main/grunt/foreach.grunt
diff --git a/src/main/ch11/grunt/group.grunt → ch11/src/main/grunt/group.grunt b/src/main/ch11/grunt/group.grunt → ch11/src/main/grunt/group.grunt
diff --git a/src/main/ch11/grunt/join.grunt → ch11/src/main/grunt/join.grunt b/src/main/ch11/grunt/join.grunt → ch11/src/main/grunt/join.grunt
diff --git a/src/main/ch11/grunt/max_temp.grunt → ch11/src/main/grunt/max_temp.grunt b/src/main/ch11/grunt/max_temp.grunt → ch11/src/main/grunt/max_temp.grunt
diff --git a/src/main/ch11/grunt/missing.grunt → ch11/src/main/grunt/missing.grunt b/src/main/ch11/grunt/missing.grunt → ch11/src/main/grunt/missing.grunt
diff --git a/src/main/ch11/grunt/multiquery.grunt → ch11/src/main/grunt/multiquery.grunt b/src/main/ch11/grunt/multiquery.grunt → ch11/src/main/grunt/multiquery.grunt
diff --git a/src/main/ch11/grunt/null.grunt → ch11/src/main/grunt/null.grunt b/src/main/ch11/grunt/null.grunt → ch11/src/main/grunt/null.grunt
diff --git a/src/main/ch11/grunt/schema.grunt → ch11/src/main/grunt/schema.grunt b/src/main/ch11/grunt/schema.grunt → ch11/src/main/grunt/schema.grunt
diff --git a/src/main/ch11/grunt/set.grunt → ch11/src/main/grunt/set.grunt b/src/main/ch11/grunt/set.grunt → ch11/src/main/grunt/set.grunt
diff --git a/src/main/ch11/grunt/sort.grunt → ch11/src/main/grunt/sort.grunt b/src/main/ch11/grunt/sort.grunt → ch11/src/main/grunt/sort.grunt
diff --git a/src/main/ch11/grunt/store.grunt → ch11/src/main/grunt/store.grunt b/src/main/ch11/grunt/store.grunt → ch11/src/main/grunt/store.grunt
diff --git a/src/main/ch11/grunt/stream.grunt → ch11/src/main/grunt/stream.grunt b/src/main/ch11/grunt/stream.grunt → ch11/src/main/grunt/stream.grunt
diff --git a/src/main/ch11/grunt/tuples.grunt → ch11/src/main/grunt/tuples.grunt b/src/main/ch11/grunt/tuples.grunt → ch11/src/main/grunt/tuples.grunt
diff --git a/src/main/ch11/grunt/types.grunt → ch11/src/main/grunt/types.grunt b/src/main/ch11/grunt/types.grunt → ch11/src/main/grunt/types.grunt
diff --git a/src/main/ch11/grunt/udfs.grunt → ch11/src/main/grunt/udfs.grunt b/src/main/ch11/grunt/udfs.grunt → ch11/src/main/grunt/udfs.grunt
diff --git a/.../java/com/hadoopbook/pig/CutLoadFunc.java → .../java/com/hadoopbook/pig/CutLoadFunc.java b/.../java/com/hadoopbook/pig/CutLoadFunc.java → .../java/com/hadoopbook/pig/CutLoadFunc.java
diff --git a/...ava/com/hadoopbook/pig/IsGoodQuality.java → ...ava/com/hadoopbook/pig/IsGoodQuality.java b/...ava/com/hadoopbook/pig/IsGoodQuality.java → ...ava/com/hadoopbook/pig/IsGoodQuality.java
diff --git a/...com/hadoopbook/pig/IsGoodQualityTest.java → ...com/hadoopbook/pig/IsGoodQualityTest.java b/...com/hadoopbook/pig/IsGoodQualityTest.java → ...com/hadoopbook/pig/IsGoodQualityTest.java
diff --git a/...n/ch11/java/com/hadoopbook/pig/Range.java → ...c/main/java/com/hadoopbook/pig/Range.java b/...n/ch11/java/com/hadoopbook/pig/Range.java → ...c/main/java/com/hadoopbook/pig/Range.java
diff --git a/...11/java/com/hadoopbook/pig/RangeTest.java → ...in/java/com/hadoopbook/pig/RangeTest.java b/...11/java/com/hadoopbook/pig/RangeTest.java → ...in/java/com/hadoopbook/pig/RangeTest.java
diff --git a/...in/ch11/java/com/hadoopbook/pig/Trim.java → ...rc/main/java/com/hadoopbook/pig/Trim.java b/...in/ch11/java/com/hadoopbook/pig/Trim.java → ...rc/main/java/com/hadoopbook/pig/Trim.java
diff --git a/src/main/ch11/pig/comment_c-style.pig → ch11/src/main/pig/comment_c-style.pig b/src/main/ch11/pig/comment_c-style.pig → ch11/src/main/pig/comment_c-style.pig
diff --git a/src/main/ch11/pig/comment_single_line.pig → ch11/src/main/pig/comment_single_line.pig b/src/main/ch11/pig/comment_single_line.pig → ch11/src/main/pig/comment_single_line.pig
diff --git a/src/main/ch11/pig/max_temp.pig → ch11/src/main/pig/max_temp.pig b/src/main/ch11/pig/max_temp.pig → ch11/src/main/pig/max_temp.pig
diff --git a/src/main/ch11/pig/max_temp_filter_stream.pig → ch11/src/main/pig/max_temp_filter_stream.pig b/src/main/ch11/pig/max_temp_filter_stream.pig → ch11/src/main/pig/max_temp_filter_stream.pig
@@ -1,6 +1,6 @@
 -- max_temp_filter_stream.pig
 DEFINE is_good_quality `is_good_quality.py`
-  SHIP ('src/main/ch11/python/is_good_quality.py');
+  SHIP ('ch11/src/main/python/is_good_quality.py');
 records = LOAD 'input/ncdc/micro-tab/sample.txt'
   AS (year:chararray, temperature:int, quality:int);
 filtered_records = STREAM records THROUGH is_good_quality

diff --git a/src/main/ch11/pig/max_temp_filter_udf.pig → ch11/src/main/pig/max_temp_filter_udf.pig b/src/main/ch11/pig/max_temp_filter_udf.pig → ch11/src/main/pig/max_temp_filter_udf.pig
diff --git a/src/main/ch11/pig/max_temp_param.param → ch11/src/main/pig/max_temp_param.param b/src/main/ch11/pig/max_temp_param.param → ch11/src/main/pig/max_temp_param.param
diff --git a/src/main/ch11/pig/max_temp_param.pig → ch11/src/main/pig/max_temp_param.pig b/src/main/ch11/pig/max_temp_param.pig → ch11/src/main/pig/max_temp_param.pig
diff --git a/src/main/ch11/pig/max_temp_station_name.pig → ch11/src/main/pig/max_temp_station_name.pig b/src/main/ch11/pig/max_temp_station_name.pig → ch11/src/main/pig/max_temp_station_name.pig
diff --git a/src/main/ch11/pig/year_stats.pig → ch11/src/main/pig/year_stats.pig b/src/main/ch11/pig/year_stats.pig → ch11/src/main/pig/year_stats.pig
diff --git a/src/main/ch11/python/is_good_quality.py → ch11/src/main/python/is_good_quality.py b/src/main/ch11/python/is_good_quality.py → ch11/src/main/python/is_good_quality.py
diff --git a/src/main/ch12/hive/buckets.txt → ch12/src/main/hive/buckets.txt b/src/main/ch12/hive/buckets.txt → ch12/src/main/hive/buckets.txt
diff --git a/src/main/ch12/hive/joins.txt → ch12/src/main/hive/joins.txt b/src/main/ch12/hive/joins.txt → ch12/src/main/hive/joins.txt
diff --git a/src/main/ch12/hive/mapreduce.txt → ch12/src/main/hive/mapreduce.txt b/src/main/ch12/hive/mapreduce.txt → ch12/src/main/hive/mapreduce.txt
@@ -1,5 +1,5 @@
-ADD FILE /Users/tom/workspace/hadoop-book/src/main/ch12/python/is_good_quality.py; 
-ADD FILE /Users/tom/workspace/hadoop-book/src/main/ch12/python/max_temperature_reduce.py;
+ADD FILE /Users/tom/workspace/hadoop-book/ch12/src/main/python/is_good_quality.py; 
+ADD FILE /Users/tom/workspace/hadoop-book/ch12/src/main/python/max_temperature_reduce.py;
 
 FROM records2
 SELECT TRANSFORM(year, temperature, quality)

diff --git a/src/main/ch12/hive/max_temp.hive → ch12/src/main/hive/max_temp.hive b/src/main/ch12/hive/max_temp.hive → ch12/src/main/hive/max_temp.hive
diff --git a/src/main/ch12/hive/partitions.hive → ch12/src/main/hive/partitions.hive b/src/main/ch12/hive/partitions.hive → ch12/src/main/hive/partitions.hive
diff --git a/src/main/ch12/hive/rcfile.hive → ch12/src/main/hive/rcfile.hive b/src/main/ch12/hive/rcfile.hive → ch12/src/main/hive/rcfile.hive
diff --git a/src/main/ch12/hive/types.hive → ch12/src/main/hive/types.hive b/src/main/ch12/hive/types.hive → ch12/src/main/hive/types.hive
diff --git a/...h12/java/com/hadoopbook/hive/Maximum.java → ...ain/java/com/hadoopbook/hive/Maximum.java b/...h12/java/com/hadoopbook/hive/Maximum.java → ...ain/java/com/hadoopbook/hive/Maximum.java
diff --git a/...n/ch12/java/com/hadoopbook/hive/Mean.java → ...c/main/java/com/hadoopbook/hive/Mean.java b/...n/ch12/java/com/hadoopbook/hive/Mean.java → ...c/main/java/com/hadoopbook/hive/Mean.java
diff --git a/.../ch12/java/com/hadoopbook/hive/Strip.java → .../main/java/com/hadoopbook/hive/Strip.java b/.../ch12/java/com/hadoopbook/hive/Strip.java → .../main/java/com/hadoopbook/hive/Strip.java
diff --git a/src/main/ch12/python/is_good_quality.py → ch12/src/main/python/is_good_quality.py b/src/main/ch12/python/is_good_quality.py → ch12/src/main/python/is_good_quality.py
diff --git a/...ain/ch12/python/max_temperature_reduce.py → ...src/main/python/max_temperature_reduce.py b/...ain/ch12/python/max_temperature_reduce.py → ...src/main/python/max_temperature_reduce.py
diff --git a/src/main/ch13/java/HBaseStationCli.java → ch13/src/main/java/HBaseStationCli.java b/src/main/ch13/java/HBaseStationCli.java → ch13/src/main/java/HBaseStationCli.java
diff --git a/src/main/ch13/java/HBaseStationImporter.java → ch13/src/main/java/HBaseStationImporter.java b/src/main/ch13/java/HBaseStationImporter.java → ch13/src/main/java/HBaseStationImporter.java
diff --git a/src/main/ch13/java/HBaseTemperatureCli.java → ch13/src/main/java/HBaseTemperatureCli.java b/src/main/ch13/java/HBaseTemperatureCli.java → ch13/src/main/java/HBaseTemperatureCli.java
diff --git a/...n/ch13/java/HBaseTemperatureImporter.java → ...c/main/java/HBaseTemperatureImporter.java b/...n/ch13/java/HBaseTemperatureImporter.java → ...c/main/java/HBaseTemperatureImporter.java
diff --git a/src/main/ch13/java/RowKeyConverter.java → ch13/src/main/java/RowKeyConverter.java b/src/main/ch13/java/RowKeyConverter.java → ch13/src/main/java/RowKeyConverter.java
diff --git a/src/main/ch14/java/ActiveKeyValueStore.java → ch14/src/main/java/ActiveKeyValueStore.java b/src/main/ch14/java/ActiveKeyValueStore.java → ch14/src/main/java/ActiveKeyValueStore.java
diff --git a/src/main/ch14/java/ConfigUpdater.java → ch14/src/main/java/ConfigUpdater.java b/src/main/ch14/java/ConfigUpdater.java → ch14/src/main/java/ConfigUpdater.java
diff --git a/src/main/ch14/java/ConfigWatcher.java → ch14/src/main/java/ConfigWatcher.java b/src/main/ch14/java/ConfigWatcher.java → ch14/src/main/java/ConfigWatcher.java
diff --git a/src/main/ch14/java/ConnectionWatcher.java → ch14/src/main/java/ConnectionWatcher.java b/src/main/ch14/java/ConnectionWatcher.java → ch14/src/main/java/ConnectionWatcher.java
diff --git a/src/main/ch14/java/CreateGroup.java → ch14/src/main/java/CreateGroup.java b/src/main/ch14/java/CreateGroup.java → ch14/src/main/java/CreateGroup.java
diff --git a/src/main/ch14/java/DeleteGroup.java → ch14/src/main/java/DeleteGroup.java b/src/main/ch14/java/DeleteGroup.java → ch14/src/main/java/DeleteGroup.java
diff --git a/src/main/ch14/java/JoinGroup.java → ch14/src/main/java/JoinGroup.java b/src/main/ch14/java/JoinGroup.java → ch14/src/main/java/JoinGroup.java
diff --git a/src/main/ch14/java/ListGroup.java → ch14/src/main/java/ListGroup.java b/src/main/ch14/java/ListGroup.java → ch14/src/main/java/ListGroup.java
diff --git a/...14/java/ResilientActiveKeyValueStore.java → ...in/java/ResilientActiveKeyValueStore.java b/...14/java/ResilientActiveKeyValueStore.java → ...in/java/ResilientActiveKeyValueStore.java
diff --git a/...ain/ch14/java/ResilientConfigUpdater.java → ...src/main/java/ResilientConfigUpdater.java b/...ain/ch14/java/ResilientConfigUpdater.java → ...src/main/java/ResilientConfigUpdater.java
diff --git a/src/main/ch14/sh/group.sh → ch14/src/main/sh/group.sh b/src/main/ch14/sh/group.sh → ch14/src/main/sh/group.sh
diff --git a/src/main/ch15/java/MaxWidgetId.java → ch15/src/main/java/MaxWidgetId.java b/src/main/ch15/java/MaxWidgetId.java → ch15/src/main/java/MaxWidgetId.java
diff --git a/src/main/ch15/java/Widget.java → ch15/src/main/java/Widget.java b/src/main/ch15/java/Widget.java → ch15/src/main/java/Widget.java
diff --git a/src/main/ch16/java/TrackStats.jr → ch16/src/main/java/TrackStats.jr b/src/main/ch16/java/TrackStats.jr → ch16/src/main/java/TrackStats.jr
diff --git a/...fm/last/hadoop/io/records/TrackStats.java → ...fm/last/hadoop/io/records/TrackStats.java b/...fm/last/hadoop/io/records/TrackStats.java → ...fm/last/hadoop/io/records/TrackStats.java
diff --git a/...bs/trackstats/TrackStatisticsProgram.java → ...bs/trackstats/TrackStatisticsProgram.java b/...bs/trackstats/TrackStatisticsProgram.java → ...bs/trackstats/TrackStatisticsProgram.java
diff --git a/src/main/common/java/JobBuilder.java → common/src/main/java/JobBuilder.java b/src/main/common/java/JobBuilder.java → common/src/main/java/JobBuilder.java
diff --git a/...in/common/java/MetOfficeRecordParser.java → .../src/main/java/MetOfficeRecordParser.java b/...in/common/java/MetOfficeRecordParser.java → .../src/main/java/MetOfficeRecordParser.java
diff --git a/src/main/common/java/NcdcRecordParser.java → common/src/main/java/NcdcRecordParser.java b/src/main/common/java/NcdcRecordParser.java → common/src/main/java/NcdcRecordParser.java
diff --git a/...main/common/java/NcdcStationMetadata.java → ...on/src/main/java/NcdcStationMetadata.java b/...main/common/java/NcdcStationMetadata.java → ...on/src/main/java/NcdcStationMetadata.java
diff --git a/...ommon/java/NcdcStationMetadataParser.java → .../main/java/NcdcStationMetadataParser.java b/...ommon/java/NcdcStationMetadataParser.java → .../main/java/NcdcStationMetadataParser.java
diff --git a/...ommon/java/MetOfficeRecordParserTest.java → .../test/java/MetOfficeRecordParserTest.java b/...ommon/java/MetOfficeRecordParserTest.java → .../test/java/MetOfficeRecordParserTest.java
diff --git a/...est/common/java/NcdcRecordParserTest.java → ...n/src/test/java/NcdcRecordParserTest.java b/...est/common/java/NcdcRecordParserTest.java → ...n/src/test/java/NcdcRecordParserTest.java
diff --git a/...n/java/NcdcStationMetadataParserTest.java → ...t/java/NcdcStationMetadataParserTest.java b/...n/java/NcdcStationMetadataParserTest.java → ...t/java/NcdcStationMetadataParserTest.java
diff --git a/snippet/bin/grunter.sh b/snippet/bin/grunter.sh
@@ -13,7 +13,7 @@ cd "$bin"/../..
 rm -rf $actual/ch11/grunt
 mkdir -p $actual/ch11/grunt
 
-for f in src/main/ch11/grunt/*.grunt; do
+for f in ch11/src/main/grunt/*.grunt; do
   out=$f.output.txt
   pig -x local < $f 2> /dev/null \
       | grep -v INFO \

diff --git a/src/main/ch02/examples/max_temperature_hadoop_cluster.input.txt b/src/main/ch02/examples/max_temperature_hadoop_cluster.input.txt
diff --git a/src/main/ch08/python/mean_max_daily_temp.sh b/src/main/ch08/python/mean_max_daily_temp.sh