Merge "Revert "Temporary workaround build system issues.""

9 files changed, 10 insertions, 28 deletions

diff --git a/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java b/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
index 4d328b95..201062d9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
+++ b/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
@@ -30,10 +30,8 @@ import java.util.Locale;
  */
 public class PhoneNumberToCarrierMapper {
   private static PhoneNumberToCarrierMapper instance = null;
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String MAPPING_DATA_DIRECTORY =
-      "/com/gaggle/i18n/phonenumbers/carrier/data/".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/carrier/data/";
   private PrefixFileReader prefixFileReader = null;
 
   private final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
diff --git a/carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java b/carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java
index 37c81582..8ca0e2d6 100644
--- a/carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java
+++ b/carrier/test/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapperTest.java
@@ -28,10 +28,8 @@ import java.util.Locale;
 public class PhoneNumberToCarrierMapperTest extends TestCase {
   private final PhoneNumberToCarrierMapper carrierMapper =
       new PhoneNumberToCarrierMapper(TEST_MAPPING_DATA_DIRECTORY);
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String TEST_MAPPING_DATA_DIRECTORY =
-      "/com/gaggle/i18n/phonenumbers/carrier/testing_data/".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/carrier/testing_data/";
 
   // Set up some test numbers to re-use.
   private static final PhoneNumber AO_MOBILE1 =
diff --git a/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java b/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
index 71e3a1ba..afbc0b2d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
+++ b/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
@@ -34,10 +34,8 @@ import java.util.logging.Logger;
  */
 public class PhoneNumberToTimeZonesMapper {
   private static PhoneNumberToTimeZonesMapper instance = null;
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String MAPPING_DATA_DIRECTORY =
-      "/com/gaggle/i18n/phonenumbers/timezones/data/".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/timezones/data/";
   private static final String MAPPING_DATA_FILE_NAME = "map_data";
   // This is defined by ICU as the unknown time zone.
   private static final String UNKNOWN_TIMEZONE = "Etc/Unknown";
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
index 46c6d0fd..5642a11d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
@@ -32,10 +32,8 @@ import java.util.Locale;
  */
 public class PhoneNumberOfflineGeocoder {
   private static PhoneNumberOfflineGeocoder instance = null;
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String MAPPING_DATA_DIRECTORY =
-      "/com/gaggle/i18n/phonenumbers/geocoding/data/".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/geocoding/data/";
   private PrefixFileReader prefixFileReader = null;
 
   private final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
diff --git a/geocoder/test/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapperTest.java b/geocoder/test/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapperTest.java
index e908fcad..8bb3423d 100644
--- a/geocoder/test/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapperTest.java
+++ b/geocoder/test/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapperTest.java
@@ -30,10 +30,8 @@ import java.util.List;
 public class PhoneNumberToTimeZonesMapperTest extends TestCase {
   private final PhoneNumberToTimeZonesMapper prefixTimeZonesMapper =
       new PhoneNumberToTimeZonesMapper(TEST_MAPPING_DATA_DIRECTORY);
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String TEST_MAPPING_DATA_DIRECTORY =
-      "/com/gaggle/i18n/phonenumbers/timezones/testing_data/".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/timezones/testing_data/";
   // Set up some test numbers to re-use.
   private static final PhoneNumber AU_NUMBER =
       new PhoneNumber().setCountryCode(61).setNationalNumber(236618300L);
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java b/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
index 087f78f7..ed9bd3b0 100644
--- a/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
@@ -29,10 +29,8 @@ import java.util.Locale;
 public class PhoneNumberOfflineGeocoderTest extends TestCase {
   private final PhoneNumberOfflineGeocoder geocoder =
       new PhoneNumberOfflineGeocoder(TEST_MAPPING_DATA_DIRECTORY);
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String TEST_MAPPING_DATA_DIRECTORY =
-      "/com/gaggle/i18n/phonenumbers/geocoding/testing_data/".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/geocoding/testing_data/";
 
   // Set up some test numbers to re-use.
   private static final PhoneNumber KO_NUMBER1 =
diff --git a/internal/prefixmapper/test/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReaderTest.java b/internal/prefixmapper/test/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReaderTest.java
index 06984eb2..8d5664be 100644
--- a/internal/prefixmapper/test/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReaderTest.java
+++ b/internal/prefixmapper/test/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReaderTest.java
@@ -26,10 +26,8 @@ import junit.framework.TestCase;
  */
 public class PrefixFileReaderTest extends TestCase {
   private final PrefixFileReader reader = new PrefixFileReader(TEST_MAPPING_DATA_DIRECTORY);
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String TEST_MAPPING_DATA_DIRECTORY =
-      "/com/gaggle/i18n/phonenumbers/geocoding/testing_data/".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/geocoding/testing_data/";
 
   private static final PhoneNumber KO_NUMBER =
       new PhoneNumber().setCountryCode(82).setNationalNumber(22123456L);
diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
index 5e36dcb3..e6f44dee 100644
--- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
+++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java
@@ -37,12 +37,10 @@ import java.util.logging.Logger;
  * would handle the main metadata file (PhoneNumberMetadata.xml) as well.
  */
 class MetadataManager {
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String ALTERNATE_FORMATS_FILE_PREFIX =
-      "/com/gaggle/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto";
   private static final String SHORT_NUMBER_METADATA_FILE_PREFIX =
-      "/com/gaggle/i18n/phonenumbers/data/ShortNumberMetadataProto".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto";
 
   private static final Logger LOGGER = Logger.getLogger(MetadataManager.class.getName());
 
diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java b/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
index de0360e7..8845eb0c 100644
--- a/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
+++ b/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java
@@ -27,10 +27,8 @@ import junit.framework.TestCase;
  * @author Shaopeng Jia
  */
 public class TestMetadataTestCase extends TestCase {
-  // TODO: Revert this hideous hack once the build system has been changed
-  // to let resource files be jar-jared.
   private static final String TEST_META_DATA_FILE_PREFIX =
-      "/com/gaggle/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting".replace("gaggle", "google");
+      "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting";
 
   protected final PhoneNumberUtil phoneUtil;