Author: rezan
Date: Sun Jul 27 22:26:28 2014
New Revision: 1613855
URL: http://svn.apache.org/r1613855
Log:
update
Modified:
incubator/devicemap/trunk/examples/servlet/pom.xml
incubator/devicemap/trunk/examples/servlet/src/main/java/org/apache/devicemap/servlet/Classify.java
incubator/devicemap/trunk/examples/servlet/src/main/webapp/index.jsp
incubator/devicemap/trunk/examples/servlet/src/main/webapp/version.jsp
Modified: incubator/devicemap/trunk/examples/servlet/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/servlet/pom.xml?rev=1613855&r1=1613854&r2=1613855&view=diff
==============================================================================
--- incubator/devicemap/trunk/examples/servlet/pom.xml (original)
+++ incubator/devicemap/trunk/examples/servlet/pom.xml Sun Jul 27 22:26:28 2014
@@ -52,6 +52,12 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified:
incubator/devicemap/trunk/examples/servlet/src/main/java/org/apache/devicemap/servlet/Classify.java
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/servlet/src/main/java/org/apache/devicemap/servlet/Classify.java?rev=1613855&r1=1613854&r2=1613855&view=diff
==============================================================================
---
incubator/devicemap/trunk/examples/servlet/src/main/java/org/apache/devicemap/servlet/Classify.java
(original)
+++
incubator/devicemap/trunk/examples/servlet/src/main/java/org/apache/devicemap/servlet/Classify.java
Sun Jul 27 22:26:28 2014
@@ -24,9 +24,8 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.devicemap.DeviceMapClient;
+import org.apache.devicemap.DeviceMapFactory;
import org.apache.devicemap.data.Device;
-import org.apache.devicemap.loader.LoaderOption;
/**
*
@@ -34,18 +33,6 @@ import org.apache.devicemap.loader.Loade
*/
public class Classify extends HttpServlet {
- private DeviceMapClient client;
-
- @Override
- public void init() throws ServletException {
- client = new DeviceMapClient();
- try {
- client.initDeviceData(LoaderOption.JAR);
- } catch(IOException ex) {
- throw new ServletException(ex);
- }
- }
-
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
String ua = request.getParameter("ua");
@@ -54,10 +41,15 @@ public class Classify extends HttpServle
ua = request.getHeader("User-Agent");
}
- Device device = client.classifyDevice(ua);
+ long start = System.nanoTime();
+
+ Device device = DeviceMapFactory.getInstance().classifyDevice(ua);
+
+ long diff = (System.nanoTime() - start) / 1000;
StringBuilder sb = new StringBuilder();
-
sb.append("{\"success\":true,\"user-agent\":\"").append(ua).append("\",\"result\":").append(device.toString()).append("}");
+
sb.append("{\"success\":true,\"user-agent\":\"").append(ua).append("\",\"time_microseconds\":");
+
sb.append(diff).append(",\"result\":").append(device.toString()).append("}");
response.setHeader("Content-Type", "application/json");
Modified: incubator/devicemap/trunk/examples/servlet/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/servlet/src/main/webapp/index.jsp?rev=1613855&r1=1613854&r2=1613855&view=diff
==============================================================================
--- incubator/devicemap/trunk/examples/servlet/src/main/webapp/index.jsp
(original)
+++ incubator/devicemap/trunk/examples/servlet/src/main/webapp/index.jsp Sun
Jul 27 22:26:28 2014
@@ -26,7 +26,6 @@
<body>
<pre>
<h1>DeviceMap Servlet Example</h1>
-
<a href="version.jsp">version</a>
<b>classify</b>
Modified: incubator/devicemap/trunk/examples/servlet/src/main/webapp/version.jsp
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/servlet/src/main/webapp/version.jsp?rev=1613855&r1=1613854&r2=1613855&view=diff
==============================================================================
--- incubator/devicemap/trunk/examples/servlet/src/main/webapp/version.jsp
(original)
+++ incubator/devicemap/trunk/examples/servlet/src/main/webapp/version.jsp Sun
Jul 27 22:26:28 2014
@@ -19,10 +19,10 @@
--%>
<html>
<head>
-<title>servlet</title>
+<title>DeviceMap</title>
</head>
<body>
-<h1>servlet</h1>
+<h1>DeviceMap</h1>
Project name: ${project.name}<br>
Project version: ${project.version}<br>
Build date: ${build.date}<br>
