JAVA: Update geocoder binary generation code.

java/build.xml

@@ -89,7 +89,7 @@
     <exec executable="java">
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
-      <arg value="GenerateAreaCodeData"/>
+      <arg value="GeneratePhonePrefixData"/>
       <arg value="${resources.dir}/geocoding/"/>
       <arg value="geocoder/src/com/google/i18n/phonenumbers/geocoding/data"/>
     </exec>
@@ -99,7 +99,7 @@
     <exec executable="java">
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
-      <arg value="GenerateAreaCodeData"/>
+      <arg value="GeneratePhonePrefixData"/>
       <arg value="${resources.dir}/test/geocoding/"/>
       <arg value="geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data"/>
     </exec>
@@ -161,7 +161,6 @@
         <include name="**/geocoding/*.class"/>
         <include name="**/prefixmapper/*.class"/>
         <exclude name="**/*Test*"/>
-        <exclude name="**/geocoding/GenerateAreaCodeData*"/>
       </fileset>
       <fileset dir="${geocoder.src.dir}">
         <include name="**/geocoding/data/*"/>

java/release_notes.txt

@@ -1,3 +1,8 @@
+Sep 23, 2013: libphonenumber-5.8.6
+* Code changes:
+  - Restructured the geocoder binary generation code, moving the classes under tools/ from
+    geocoding/ to buildtools/ and renaming AreaCode to PhonePrefix.
+
 Sep 23, 2013: libphonenumber-5.8.5
 * Code changes:
   - Restructured the geocoder, moving the utility classes to a new module internal/prefixmapper.

tools/java/java-build/pom.xml

@@ -65,9 +65,9 @@
                 <!-- Add ../../../java/libphonenumber/src/ to make Phonemetadata.java available to
                      the source directories. -->
                 <source>../../../java/libphonenumber/src/</source>
-                <!-- Add ../../../java/geocoder/src/ to make AreaCodeMap.java available to the
-                     source directories. -->
-                <source>../../../java/geocoder/src/</source>
+                <!-- Add ../../../java/internal/phoneprefix/src/ to make PhonePrefixMap.java
+                     available to the source directories. -->
+                <source>../../../java/internal/prefixmapper/src/</source>
                 <!-- Add ../common/src/ which contains BuildMetadataFromXml.java -->
                 <source>../common/src/</source>
               </sources>

tools/java/java-build/src/com/google/i18n/phonenumbers/EntryPoint.java

@@ -16,7 +16,7 @@
 
 package com.google.i18n.phonenumbers;
 
-import com.google.i18n.phonenumbers.geocoding.GenerateAreaCodeDataEntryPoint;
+import com.google.i18n.phonenumbers.buildtools.GeneratePhonePrefixDataEntryPoint;
 
 /**
  * Entry point class for Java and JavaScript build tools.
@@ -29,7 +29,7 @@ public class EntryPoint {
     boolean status = new CommandDispatcher(args, new Command[] {
       new BuildMetadataJsonFromXml(),
       new BuildMetadataProtoFromXml(),
-      new GenerateAreaCodeDataEntryPoint(),
+      new GeneratePhonePrefixDataEntryPoint(),
     }).start();
 
     System.exit(status ? 0 : 1);