From 9616170a2fea186b8f48e4841bbf864bd78c56f6 Mon Sep 17 00:00:00 2001
From: Shaopeng Jia <jia.shao.peng@gmail.com>
Date: Sat, 29 May 2010 12:30:44 +0000
Subject: [PATCH] Reorganize project structure to make it easy to build.

---
 java/build.xml                                      |   7 +++++--
 .../phonenumbers/BuildMetadataProtoFromXml.java     |   0
 .../google/i18n/phonenumbers/phonemetadata.proto    |   0
 .../i18n/phonenumbers/proto}/phonenumber.proto      |   0
 .../i18n/phonenumbers}/PhoneNumberMetadataProto     | Bin
 .../google/i18n/phonenumbers/PhoneNumberUtil.java   |   2 +-
 .../i18n/phonenumbers/AsYouTypeFormatterTest.java   |   2 +-
 .../PhoneNumberMetadataProtoForTesting              | Bin
 .../i18n/phonenumbers/PhoneNumberUtilTest.java      |   2 +-
 9 files changed, 8 insertions(+), 5 deletions(-)
 rename java/{src => resources}/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java (100%)
 rename java/{src => resources}/com/google/i18n/phonenumbers/phonemetadata.proto (100%)
 rename java/{src/com/google/i18n/phonenumbers => resources/com/google/i18n/phonenumbers/proto}/phonenumber.proto (100%)
 rename java/{resources/com/google/i18n/phonenumbers/src/generated_files => src/com/google/i18n/phonenumbers}/PhoneNumberMetadataProto (100%)
 rename java/{resources/com/google/i18n/phonenumbers/test/generated_files => test/com/google/i18n/phonenumbers}/PhoneNumberMetadataProtoForTesting (100%)

diff --git a/java/build.xml b/java/build.xml
index 9fd344da7..27c291098 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -26,6 +26,7 @@
     <mkdir dir="${classes.dir}"/>
     <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
     <javac srcdir="${test.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+    <javac srcdir="${resources.dir}" destdir="${classes.dir}" classpathref="classpath"/>
   </target>
 
   <target name="jar" depends="compile">
@@ -35,7 +36,7 @@
         <include name="**/*.class"/>
         <exclude name="**/*Test*"/>
       </fileset>
-      <fileset dir="${resources.dir}">
+      <fileset dir="${src.dir}">
         <include name="**/PhoneNumberMetadataProto"/>
       </fileset>
     </jar>
@@ -48,8 +49,10 @@
         <include name="**/*.class"/>
         <exclude name="**/*Test*"/>
       </fileset>
-      <fileset dir="${resources.dir}">
+      <fileset dir="${src.dir}">
         <include name="**/PhoneNumberMetadataProto"/>
+      </fileset>
+      <fileset dir="${test.dir}">
         <include name="**/PhoneNumberMetadataProtoForTesting"/>
       </fileset>
     </jar>
diff --git a/java/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java b/java/resources/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
similarity index 100%
rename from java/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
rename to java/resources/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java
diff --git a/java/src/com/google/i18n/phonenumbers/phonemetadata.proto b/java/resources/com/google/i18n/phonenumbers/phonemetadata.proto
similarity index 100%
rename from java/src/com/google/i18n/phonenumbers/phonemetadata.proto
rename to java/resources/com/google/i18n/phonenumbers/phonemetadata.proto
diff --git a/java/src/com/google/i18n/phonenumbers/phonenumber.proto b/java/resources/com/google/i18n/phonenumbers/proto/phonenumber.proto
similarity index 100%
rename from java/src/com/google/i18n/phonenumbers/phonenumber.proto
rename to java/resources/com/google/i18n/phonenumbers/proto/phonenumber.proto
diff --git a/java/resources/com/google/i18n/phonenumbers/src/generated_files/PhoneNumberMetadataProto b/java/src/com/google/i18n/phonenumbers/PhoneNumberMetadataProto
similarity index 100%
rename from java/resources/com/google/i18n/phonenumbers/src/generated_files/PhoneNumberMetadataProto
rename to java/src/com/google/i18n/phonenumbers/PhoneNumberMetadataProto
diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index 12a8b4681..ce0ab66c9 100644
--- a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -50,7 +50,7 @@ public class PhoneNumberUtil {
   private static final int MIN_LENGTH_FOR_NSN = 3;
   private static final int MAX_LENGTH_FOR_NSN = 15;
   private static final String META_DATA_FILE =
-      "/com/google/i18n/phonenumbers/src/generated_files/PhoneNumberMetadataProto";
+      "/com/google/i18n/phonenumbers/PhoneNumberMetadataProto";
   private static final Logger LOGGER = Logger.getLogger(PhoneNumberUtil.class.getName());
 
   // A mapping from a country code to a region code which denotes the country/region
diff --git a/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
index 7be5f5ba1..087e52e46 100644
--- a/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
+++ b/java/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java
@@ -32,7 +32,7 @@ import java.io.InputStream;
 public class AsYouTypeFormatterTest extends TestCase {
   private PhoneNumberUtil phoneUtil;
   private static final String TEST_META_DATA_FILE =
-      "/com/google/i18n/phonenumbers/test/generated_files/PhoneNumberMetadataProtoForTesting";
+      "/com/google/i18n/phonenumbers/PhoneNumberMetadataProtoForTesting";
 
   public AsYouTypeFormatterTest() {
     PhoneNumberUtil.resetInstance();
diff --git a/java/resources/com/google/i18n/phonenumbers/test/generated_files/PhoneNumberMetadataProtoForTesting b/java/test/com/google/i18n/phonenumbers/PhoneNumberMetadataProtoForTesting
similarity index 100%
rename from java/resources/com/google/i18n/phonenumbers/test/generated_files/PhoneNumberMetadataProtoForTesting
rename to java/test/com/google/i18n/phonenumbers/PhoneNumberMetadataProtoForTesting
diff --git a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
index a8206fe97..9499fbea4 100644
--- a/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
+++ b/java/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java
@@ -41,7 +41,7 @@ import java.util.regex.Pattern;
 public class PhoneNumberUtilTest extends TestCase {
   private PhoneNumberUtil phoneUtil;
   private static final String TEST_META_DATA_FILE =
-      "/com/google/i18n/phonenumbers/test/generated_files/PhoneNumberMetadataProtoForTesting";
+      "/com/google/i18n/phonenumbers/PhoneNumberMetadataProtoForTesting";
 
   public PhoneNumberUtilTest() {
     PhoneNumberUtil.resetInstance();