DATA: Change "PhoneNumberMetaData" to "PhoneNumberMetadata" throughout for consistency

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@587 ee073f10-1060-11df-b6a4-87a95322a99c

14 files changed, 29 insertions, 18 deletions

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 9bf41d9..564a604 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -277,7 +277,7 @@ if (${USE_LITE_METADATA} STREQUAL "ON")
   set (METADATA_TARGET "generate-lite-metadata")
   add_metadata_gen_target (
     ${METADATA_TARGET}
-    "${RESOURCES_DIR}/PhoneNumberMetaData.xml"
+    "${RESOURCES_DIR}/PhoneNumberMetadata.xml"
     "lite_metadata"
     "metadata"
   )
@@ -287,7 +287,7 @@ else ()
   set (METADATA_TARGET "generate-metadata")
   add_metadata_gen_target (
     ${METADATA_TARGET}
-    "${RESOURCES_DIR}/PhoneNumberMetaData.xml"
+    "${RESOURCES_DIR}/PhoneNumberMetadata.xml"
     "metadata"
     "metadata"
   )
@@ -298,7 +298,7 @@ endif ()
 set (TEST_METADATA_TARGET "generate-test-metadata")
 add_metadata_gen_target (
   ${TEST_METADATA_TARGET}
-  "${RESOURCES_DIR}/PhoneNumberMetaDataForTesting.xml"
+  "${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml"
   "test_metadata"
   "metadata"
 )
diff --git a/debian/changelog b/debian/changelog
index 935e2ad..f9aacf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libphonenumber (5.6.1) precise; urgency=low
+
+  * Code changes:
+   - Rename all instances of PhoneNumberMetadata to PhoneNumberMetadata for consistency.
+
+ -- David Yonge-Mallo <davinci@google.com>  Fri, Jul 12 2013 10:26:53 +0200
+
 libphonenumber (5.6) precise; urgency=low
 
   * Code changes:
diff --git a/java/build.xml b/java/build.xml
index 41bad2f..baceb90 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -32,7 +32,7 @@
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataProtoFromXml"/>
-      <arg value="--input-file=${resources.dir}/PhoneNumberMetaData.xml"/>
+      <arg value="--input-file=${resources.dir}/PhoneNumberMetadata.xml"/>
       <arg value="--output-dir=${libphonenumber.src.dir}/com/google/i18n/phonenumbers"/>
       <arg value="--data-prefix=data/PhoneNumberMetadataProto"/>
       <arg value="--mapping-class=CountryCodeToRegionCodeMap"/>
@@ -46,7 +46,7 @@
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataProtoFromXml"/>
-      <arg value="--input-file=${resources.dir}/PhoneNumberMetaDataForTesting.xml"/>
+      <arg value="--input-file=${resources.dir}/PhoneNumberMetadataForTesting.xml"/>
       <arg value="--output-dir=${libphonenumber.test.dir}/com/google/i18n/phonenumbers"/>
       <arg value="--data-prefix=data/PhoneNumberMetadataProtoForTesting"/>
       <arg value="--mapping-class=CountryCodeToRegionCodeMapForTesting"/>
@@ -94,14 +94,14 @@
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataJsonFromXml"/>
-      <arg value="${resources.dir}/PhoneNumberMetaData.xml"/>
+      <arg value="${resources.dir}/PhoneNumberMetadata.xml"/>
       <arg value="${javascript.dir}/i18n/phonenumbers/metadata.js"/>
     </exec>
     <exec executable="java">
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataJsonFromXml"/>
-      <arg value="${resources.dir}/PhoneNumberMetaData.xml"/>
+      <arg value="${resources.dir}/PhoneNumberMetadata.xml"/>
       <arg value="${javascript.dir}/i18n/phonenumbers/metadatalite.js"/>
       <arg value="true"/> <!-- Lite metadata. -->
     </exec>
@@ -109,7 +109,7 @@
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataJsonFromXml"/>
-      <arg value="${resources.dir}/PhoneNumberMetaDataForTesting.xml"/>
+      <arg value="${resources.dir}/PhoneNumberMetadataForTesting.xml"/>
       <arg value="${javascript.dir}/i18n/phonenumbers/metadatafortesting.js"/>
     </exec>
   </target>
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
index 73e5de9..3817f90 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
 /**
  * Class encapsulating loading of PhoneNumber Metadata information. Currently this is used only for
  * additional data files such as PhoneNumberAlternateFormats, but in the future it is envisaged it
- * would handle the main metadata file (PhoneNumberMetaData.xml) as well.
+ * would handle the main metadata file (PhoneNumberMetadata.xml) as well.
  *
  * @author Lara Rennie
  */
diff --git a/java/release_notes.txt b/java/release_notes.txt
index 21b0020..70389ab 100644
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -1,3 +1,7 @@
+Jul 12, 2013: libphonenumber-5.6.1
+* Code changes:
+ - Rename all instances of PhoneNumberMetadata to PhoneNumberMetadata for consistency.
+
 Jun 05, 2013: libphonenumber-5.6
 * Code changes:
  - Fix for as-you-type-formatting bug affecting countries with no national prefix
diff --git a/javascript/README b/javascript/README
index 76b42cb..558ce87 100644
--- a/javascript/README
+++ b/javascript/README
@@ -68,7 +68,7 @@ project:
       mvn -f tools/java/java-build/pom.xml package
 
 2.  If the phone number metadata in the XML format has changed
-    (resources/PhoneNumberMetaData.xml)
+    (resources/PhoneNumberMetadata.xml)
     run the following commands to regenerate metadata.js and
     metadatafortesting.js:
 
diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js
index f1efc2d..e77ad54 100644
--- a/javascript/i18n/phonenumbers/metadata.js
+++ b/javascript/i18n/phonenumbers/metadata.js
@@ -17,7 +17,7 @@
 
 /**
  * @fileoverview Generated metadata for file
- * ../resources/PhoneNumberMetaData.xml
+ * ../resources/PhoneNumberMetadata.xml
  * @author Nikolaos Trogkanis
  */
 
diff --git a/javascript/i18n/phonenumbers/metadatafortesting.js b/javascript/i18n/phonenumbers/metadatafortesting.js
index fbf72f5..336656b 100644
--- a/javascript/i18n/phonenumbers/metadatafortesting.js
+++ b/javascript/i18n/phonenumbers/metadatafortesting.js
@@ -17,7 +17,7 @@
 
 /**
  * @fileoverview Generated metadata for file
- * ../resources/PhoneNumberMetaDataForTesting.xml
+ * ../resources/PhoneNumberMetadataForTesting.xml
  * @author Nikolaos Trogkanis
  */
 
diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
index 7a9a2f9..48181ab 100644
--- a/javascript/i18n/phonenumbers/metadatalite.js
+++ b/javascript/i18n/phonenumbers/metadatalite.js
@@ -17,7 +17,7 @@
 
 /**
  * @fileoverview Generated metadata for file
- * ../resources/PhoneNumberMetaData.xml
+ * ../resources/PhoneNumberMetadata.xml
  * @author Nikolaos Trogkanis
  */
 
diff --git a/resources/PhoneNumberAlternateFormats.xml b/resources/PhoneNumberAlternateFormats.xml
index 5997ac1..9fca114 100644
--- a/resources/PhoneNumberAlternateFormats.xml
+++ b/resources/PhoneNumberAlternateFormats.xml
@@ -18,7 +18,7 @@
      Additional Phone Number Formatting information, containing alternative
      formats that are commonly used when writing phone numbers in certain
      countries. Note that this is in addition to the formatting information
-     provided by the main PhoneNumberMetaData.xml file - formatting patterns
+     provided by the main PhoneNumberMetadata.xml file - formatting patterns
      should not be duplicated.
 
      Note also that only the most specific leading-digits pattern is present for
@@ -27,7 +27,7 @@
      on alternate formatting patterns.
 
      For regions that share a country calling code, only the region with
-     mainCountryForCode set to true in PhoneNumberMetaData.xml should be present
+     mainCountryForCode set to true in PhoneNumberMetadata.xml should be present
      here.
 
      Note: Territories are in alphabetical order by their IDs, which are based on ISO 3166-1
diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetadata.xml
index 5d8e732..5d8e732 100644
--- a/resources/PhoneNumberMetaData.xml
+++ b/resources/PhoneNumberMetadata.xml
diff --git a/resources/PhoneNumberMetaDataForTesting.xml b/resources/PhoneNumberMetadataForTesting.xml
index eff33d8..055f471 100644
--- a/resources/PhoneNumberMetaDataForTesting.xml
+++ b/resources/PhoneNumberMetadataForTesting.xml
@@ -16,7 +16,7 @@
 
      MetaData on Phone Number Plan and formatting rules. This file is used
      solely for the purpose of unittesting, so data in this file is not
-     necessarily consistent with that of PhoneNumberMetaData.xml.
+     necessarily consistent with that of PhoneNumberMetadata.xml.
 -->
 
 <phoneNumberMetadata>
diff --git a/resources/phonemetadata.proto b/resources/phonemetadata.proto
index ecd3ba2..87f4c1e 100644
--- a/resources/phonemetadata.proto
+++ b/resources/phonemetadata.proto
@@ -16,7 +16,7 @@
 
 // Definition of protocol buffer for holding metadata for international
 // telephone numbers. The fields here correspond exactly to those in
-// resources/PhoneNumberMetaData.xml.
+// resources/PhoneNumberMetadata.xml.
 // @author Shaopeng Jia
 
 syntax = "proto2";
diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
index d399d0c..452adce 100644
--- a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
+++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
@@ -71,7 +71,7 @@ public class BuildMetadataProtoFromXml extends Command {
       "\n" +
       "Example command line invocation:\n" +
       CLASS_NAME + " \\\n" +
-      "  --" + INPUT_FILE + "=resources/PhoneNumberMetaData.xml \\\n" +
+      "  --" + INPUT_FILE + "=resources/PhoneNumberMetadata.xml \\\n" +
       "  --" + OUTPUT_DIR + "=java/libphonenumber/src/com/google/i18n/phonenumbers \\\n" +
       "  --" + DATA_PREFIX + "=data/PhoneNumberMetadataProto \\\n" +
       "  --" + MAPPING_CLASS + "=CountryCodeToRegionCodeMap \\\n" +