Reorganize project structure to make it easy to build.

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>

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

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();

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();