JAVA-DEMO: Upload code to run Java demo.
authorjia.shao.peng <jia.shao.peng@ee073f10-1060-11df-b6a4-87a95322a99c>
Thu, 10 Mar 2011 10:08:19 +0000 (10:08 +0000)
committerjia.shao.peng <jia.shao.peng@ee073f10-1060-11df-b6a4-87a95322a99c>
Thu, 10 Mar 2011 10:08:19 +0000 (10:08 +0000)
git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@105 ee073f10-1060-11df-b6a4-87a95322a99c

java/demo/build.xml [new file with mode: 0644]
java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java [new file with mode: 0644]
java/demo/war/WEB-INF/appengine-web.xml [new file with mode: 0644]
java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar [new file with mode: 0644]
java/demo/war/WEB-INF/lib/commons-io-1.4.jar [new file with mode: 0644]
java/demo/war/WEB-INF/logging.properties [new file with mode: 0644]
java/demo/war/WEB-INF/web.xml [new file with mode: 0644]
java/demo/war/phonenumberparser.jsp [new file with mode: 0644]
java/release_notes.txt

diff --git a/java/demo/build.xml b/java/demo/build.xml
new file mode 100644 (file)
index 0000000..b9ed0cb
--- /dev/null
@@ -0,0 +1,59 @@
+<project>
+  <property name="appengine-sdk.dir" location="../../appengine-java-sdk" />
+
+  <import file="${appengine-sdk.dir}/config/user/ant-macros.xml" />
+
+  <path id="project.classpath">
+    <pathelement path="war/WEB-INF/classes" />
+    <fileset dir="war/WEB-INF/lib">
+      <include name="**/*.jar" />
+    </fileset>
+    <fileset dir="${appengine-sdk.dir}/lib">
+      <include name="shared/**/*.jar" />
+    </fileset>
+  </path>
+
+  <target name="copyjars" description="Copies the App Engine JARs to the WAR.">
+    <copy todir="war/WEB-INF/lib" flatten="true">
+      <fileset dir="${appengine-sdk.dir}/lib/user">
+        <include name="**/*.jar" />
+      </fileset>
+    </copy>
+  </target>
+
+  <target name="compile" depends="copyjars"
+          description="Compiles Java source and copies other source files to the WAR.">
+    <mkdir dir="war/WEB-INF/classes" />
+    <copy todir="war/WEB-INF/classes">
+      <fileset dir="src">
+        <exclude name="**/*.java" />
+      </fileset>
+    </copy>
+    <javac srcdir="src" destdir="war/WEB-INF/classes" classpathref="project.classpath" debug="on"
+           includeAntRuntime="false"/>
+  </target>
+
+  <target name="runserver" depends="compile" description="Starts the development server.">
+    <dev_appserver war="war" />
+  </target>
+
+  <target name="update" depends="compile" description="Uploads the application to App Engine.">
+    <appcfg action="update" war="war" />
+  </target>
+
+  <target name="rollback" depends="compile"
+          description="Rolls back an interrupted application update.">
+    <appcfg action="rollback" war="war" />
+  </target>
+
+  <target name="request_logs" description="Downloads log data from App Engine for the application.">
+    <appcfg action="request_logs" war="war">
+      <options>
+        <arg value="--num_days=5"/>
+      </options>
+      <args>
+        <arg value="logs.txt"/>
+      </args>
+    </appcfg>
+  </target>
+</project>
diff --git a/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
new file mode 100644 (file)
index 0000000..7fa6dca
--- /dev/null
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Shaopeng Jia
+ */
+
+package com.google.phonenumbers;
+
+import com.google.i18n.phonenumbers.AsYouTypeFormatter;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
+import org.apache.commons.fileupload.FileItemIterator;
+import org.apache.commons.fileupload.FileItemStream;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.fileupload.util.Streams;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * A servlet that accepts requests that contain strings representing a phone number and a default
+ * country, and responds with results from parsing, validating and formatting the number. The
+ * default country is a two-letter region code representing the country that we are expecting the
+ * number to be from.
+ */
+@SuppressWarnings("serial")
+public class PhoneNumberParserServlet extends HttpServlet {
+  private PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
+  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    String phoneNumber = null;
+    String defaultCountry = null;
+    String fileContents = null;
+    ServletFileUpload upload = new ServletFileUpload();
+    upload.setSizeMax(50000);
+    try {
+      FileItemIterator iterator = upload.getItemIterator(req);
+      while (iterator.hasNext()) {
+        FileItemStream item = iterator.next();
+        InputStream in = item.openStream();
+        if (item.isFormField()) {
+          if (item.getFieldName().equals("phoneNumber")) {
+            phoneNumber = Streams.asString(in, "UTF-8");
+          } else if (item.getFieldName().equals("defaultCountry")) {
+            defaultCountry = Streams.asString(in);
+          }
+        } else {
+          try {
+            fileContents = IOUtils.toString(in);
+          } finally {
+            IOUtils.closeQuietly(in);
+          }
+        }
+      }
+    } catch (FileUploadException e1) {
+      e1.printStackTrace();
+    }
+
+    StringBuffer output;
+    if (fileContents.length() == 0) {
+      output = getOutputForSingleNumber(phoneNumber, defaultCountry);
+      resp.setContentType("text/plain");
+      resp.getWriter().println("Phone Number entered: " + phoneNumber);
+      resp.getWriter().println("defaultCountry entered: " + defaultCountry);
+    } else {
+      output = getOutputForFile(defaultCountry, fileContents);
+      resp.setContentType("text/html");
+    }
+    resp.getWriter().println(output);
+  }
+
+  private StringBuffer getOutputForFile(String defaultCountry, String fileContents) {
+    StringBuffer output = new StringBuffer();
+    output.append("<HTML><HEAD><TITLE>Results generated from phone numbers in the file provided:" 
+        + "</TITLE></HEAD><BODY>");
+    output.append("<TABLE align=center border=1>");
+    output.append("<TH align=center>ID</TH>");
+    output.append("<TH align=center>Raw phone number</TH>");
+    output.append("<TH align=center>Pretty formatting</TH>");
+    output.append("<TH align=center>International format</TH>");
+
+    int phoneNumberId = 0;
+    StringTokenizer tokenizer = new StringTokenizer(fileContents, ",");
+    while (tokenizer.hasMoreTokens()) {
+      String numberStr = tokenizer.nextToken();
+      phoneNumberId++;
+      output.append("<TR>");
+      output.append("<TD align=center>").append(phoneNumberId).append(" </TD> \n");
+      output.append("<TD align=center>").append(numberStr).append(" </TD> \n");
+      try {
+        PhoneNumber number = phoneUtil.parseAndKeepRawInput(numberStr, defaultCountry);
+        boolean isNumberValid = phoneUtil.isValidNumber(number);
+        String prettyFormat = isNumberValid
+            ? phoneUtil.formatInOriginalFormat(number, defaultCountry)
+            : "invalid";
+        String internationalFormat = isNumberValid
+            ? phoneUtil.format(number, PhoneNumberFormat.INTERNATIONAL)
+            : "invalid";
+
+        output.append("<TD align=center>").append(prettyFormat).append(" </TD> \n");
+        output.append("<TD align=center>").append(internationalFormat).append(" </TD> \n");
+      } catch (NumberParseException e) {
+        output.append("<TD align=center colspan=2>").append(e.toString()).append(" </TD> \n");
+      }
+      output.append("</TR>");
+    }
+    output.append("</BODY></HTML>");
+    return output;
+  }
+
+  private StringBuffer getOutputForSingleNumber(String phoneNumber, String defaultCountry) {
+    StringBuffer output = new StringBuffer();
+    try {
+      PhoneNumber number = phoneUtil.parseAndKeepRawInput(phoneNumber, defaultCountry);
+      output.append("\n\n****Parsing Result:****");
+      output.append("\ncountry_code: ").append(number.getCountryCode());
+      output.append("\nnational_number: ").append(number.getNationalNumber());
+      output.append("\nextension:").append(number.getExtension());
+      output.append("\ncountry_code_source: ").append(number.getCountryCodeSource());
+      output.append("\nitalian_leading_zero: ").append(number.getItalianLeadingZero());
+      output.append("\nraw_input: ").append(number.getRawInput());
+
+      output.append("\n\n****Validation Results:****");
+      boolean isNumberValid = phoneUtil.isValidNumber(number);
+      output.append("\nResult from isValidNumber(): ").append(isNumberValid);
+      output.append("\nResult from isValidNumberForRegion(): ").append(
+          phoneUtil.isValidNumberForRegion(number, defaultCountry));
+      output.append("\nResult from isPossibleNumber(): ").append(
+          phoneUtil.isPossibleNumber(number));
+      output.append("\nResult from getNumberType(): ").append(phoneUtil.getNumberType(number));
+
+      output.append("\n\n****Formatting Results:**** ");
+      output.append("\nE164 format: ").append(
+          isNumberValid ? phoneUtil.format(number, PhoneNumberFormat.E164) : "invalid");
+      output.append("\nOriginal format: ").append(
+          phoneUtil.formatInOriginalFormat(number, defaultCountry));
+      output.append("\nInternational format: ").append(
+          isNumberValid ? phoneUtil.format(number, PhoneNumberFormat.INTERNATIONAL) : "invalid");
+      output.append("\nNational format: ").append(
+          phoneUtil.format(number, PhoneNumberFormat.NATIONAL));
+      output.append("\nOut-of-country format from US: ").append(
+          isNumberValid ? phoneUtil.formatOutOfCountryCallingNumber(number, "US") : "invalid");
+      output.append("\n\n****AsYouTypeFormatter Results****");
+      AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter(defaultCountry);
+      int rawNumberLength = phoneNumber.length();
+      for (int i = 0; i < rawNumberLength; i++) {
+        // Note this doesn't handle supplementary characters, but it shouldn't be a big deal as
+        // there are no dial-pad characters in the supplementary range.
+        char inputChar = phoneNumber.charAt(i);
+        output.append("\nChar entered: ").append(inputChar).append(" Output: ")
+            .append(formatter.inputDigit(inputChar));
+      }
+      output.append("\n\n");
+    } catch (NumberParseException e) {
+      output.append(e.toString());
+    }
+    return output;
+  }
+}
diff --git a/java/demo/war/WEB-INF/appengine-web.xml b/java/demo/war/WEB-INF/appengine-web.xml
new file mode 100644 (file)
index 0000000..06c15d5
--- /dev/null
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <application>libphonenumber</application>
+  <version>1</version>
+
+  <!-- Configure java.util.logging -->
+  <system-properties>
+    <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
+  </system-properties>
+</appengine-web-app>
diff --git a/java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar b/java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar
new file mode 100644 (file)
index 0000000..aa209b3
Binary files /dev/null and b/java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar differ
diff --git a/java/demo/war/WEB-INF/lib/commons-io-1.4.jar b/java/demo/war/WEB-INF/lib/commons-io-1.4.jar
new file mode 100644 (file)
index 0000000..133dc6c
Binary files /dev/null and b/java/demo/war/WEB-INF/lib/commons-io-1.4.jar differ
diff --git a/java/demo/war/WEB-INF/logging.properties b/java/demo/war/WEB-INF/logging.properties
new file mode 100644 (file)
index 0000000..a172066
--- /dev/null
@@ -0,0 +1,13 @@
+# A default java.util.logging configuration.
+# (All App Engine logging is through java.util.logging by default).
+#
+# To use this configuration, copy it into your application's WEB-INF
+# folder and add the following to your appengine-web.xml:
+# 
+# <system-properties>
+#   <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
+# </system-properties>
+#
+
+# Set the default logging level for all loggers to WARNING
+.level = WARNING
diff --git a/java/demo/war/WEB-INF/web.xml b/java/demo/war/WEB-INF/web.xml
new file mode 100644 (file)
index 0000000..5a4ba5c
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+  http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+  <servlet>
+    <servlet-name>PhoneNumberParser</servlet-name>
+    <servlet-class>com.google.phonenumbers.PhoneNumberParserServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>PhoneNumberParser</servlet-name>
+    <url-pattern>/phonenumberparser</url-pattern>
+  </servlet-mapping>
+  <welcome-file-list>
+    <welcome-file>phonenumberparser.jsp</welcome-file>
+  </welcome-file-list>
+</web-app>
diff --git a/java/demo/war/phonenumberparser.jsp b/java/demo/war/phonenumberparser.jsp
new file mode 100644 (file)
index 0000000..4860f24
--- /dev/null
@@ -0,0 +1,28 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+  <body>
+    <h2>Phone Number Parser Demo</h2>
+    <form action="/phonenumberparser" method="post" accept-charset="UTF-8"
+          enctype="multipart/form-data">
+      <h2>Step 1</h2>
+      <p>
+      Specify a Phone Number: <input type="text" name="phoneNumber" size="25">
+      <p>
+      <b>Or</b> Upload a file containing phone numbers separated by comma.
+      <p>
+      <input type="file" name="numberFile" size="30">
+      <p>
+      <h2>Step 2</h2>
+      <p>
+      Specify a Default Country:
+      <input type="text" name="defaultCountry" size="2">
+          (<a href="http://www.iso.org/iso/english_country_names_and_code_elements">
+          ISO 3166-1 two-letter country code</a>)
+      <p></p>
+      <input type="submit" value="Submit">
+      <input type="reset" value="Reset">
+      <p></p>
+      <a href="http://code.google.com/p/libphonenumber/">Back to libphonenumber</a>
+    </form>
+  </body>
+</html>
index 33f862a88e6abdf9d362b3281add24d87eacec8c..c26cb85b970b039bb64c2100ec1b2e76cd5aa566 100644 (file)
@@ -1,3 +1,7 @@
+Mar 10th, 2011
+* Code changes:
+  - releasing the code to run the demo on localhost or appengine.
+
 Mar 3rd, 2011
 * Metadata changes:
  - Adding support for AC