You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by re...@apache.org on 2013/05/13 02:14:44 UTC
svn commit: r1481674 - in
/incubator/devicemap/trunk/web/webservice-java/src/main:
java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java
webapp/WEB-INF/views/show.jsp webapp/WEB-INF/views/showjs.jsp
webapp/WEB-INF/views/showjscb.jsp
Author: rezan
Date: Mon May 13 00:14:43 2013
New Revision: 1481674
URL: http://svn.apache.org/r1481674
Log:
configurable UA
Modified:
incubator/devicemap/trunk/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java
incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/show.jsp
incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjs.jsp
incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjscb.jsp
Modified: incubator/devicemap/trunk/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java?rev=1481674&r1=1481673&r2=1481674&view=diff
==============================================================================
--- incubator/devicemap/trunk/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java (original)
+++ incubator/devicemap/trunk/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java Mon May 13 00:14:43 2013
@@ -65,9 +65,18 @@ public class IdentificationFilter implem
throw new RuntimeException(ex);
}
- PropertyRef[] propertyRefs = new PropertyRef[] {vendorRef, modelRef, displayWidthRef, displayHeightRef};
+ PropertyRef[] propertyRefs = new PropertyRef[] {vendorRef, modelRef, displayWidthRef, displayHeightRef, inputDevicesRef,
+ idRef, tabletRef, wirelessRef};
Evidence e = new ODDRHTTPEvidence();
- e.put("User-Agent", ((HttpServletRequest)request).getHeader("User-Agent"));
+
+ String ua=((HttpServletRequest)request).getParameter("ua");
+ if(ua==null || ua.isEmpty()) {
+ ua=((HttpServletRequest)request).getHeader("User-Agent");
+ }
+
+ ((HttpServletRequest)request).setAttribute("dmapUA", ua);
+
+ e.put("User-Agent", ua);
try {
PropertyValues propertyValues = identificationService.getPropertyValues(e, propertyRefs);
Modified: incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/show.jsp
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/show.jsp?rev=1481674&r1=1481673&r2=1481674&view=diff
==============================================================================
--- incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/show.jsp (original)
+++ incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/show.jsp Mon May 13 00:14:43 2013
@@ -6,14 +6,15 @@
<body>
<h1>OpenDDR Java Service</h1>
<pre>
-vendor: ${dmapVendor}
-model: ${dmapModel}
-displayWidth: ${dmapDisplayWidth}
-displayHeight: ${dmapDisplayHeight}
-inputDevices: ${dmapInputDevices}
-id: ${dmapId}
-tablet: ${dmapTablet}
-wireless: ${dmapWireless}
+user agent: ${dmapUA}
+vendor: ${dmapVendor}
+model: ${dmapModel}
+displayWidth: ${dmapDisplayWidth}
+displayHeight: ${dmapDisplayHeight}
+inputDevices: ${dmapInputDevices}
+id: ${dmapId}
+tablet: ${dmapTablet}
+wireless: ${dmapWireless}
</pre>
</body>
</html>
Modified: incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjs.jsp
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjs.jsp?rev=1481674&r1=1481673&r2=1481674&view=diff
==============================================================================
--- incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjs.jsp (original)
+++ incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjs.jsp Mon May 13 00:14:43 2013
@@ -3,6 +3,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
{
+ "ua":"${dmapUA}",
"vendor":"${dmapVendor}",
"model":"${dmapModel}",
"displayWidth":"${dmapDisplayWidth}",
Modified: incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjscb.jsp
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjscb.jsp?rev=1481674&r1=1481673&r2=1481674&view=diff
==============================================================================
--- incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjscb.jsp (original)
+++ incubator/devicemap/trunk/web/webservice-java/src/main/webapp/WEB-INF/views/showjscb.jsp Mon May 13 00:14:43 2013
@@ -4,6 +4,7 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
${callback}(
{
+ "ua":"${dmapUA}",
"vendor":"${dmapVendor}",
"model":"${dmapModel}",
"displayWidth":"${dmapDisplayWidth}",