Return-Path: X-Original-To: apmail-devicemap-commits-archive@www.apache.org Delivered-To: apmail-devicemap-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C445BCD35 for ; Sun, 28 Dec 2014 02:45:12 +0000 (UTC) Received: (qmail 84438 invoked by uid 500); 28 Dec 2014 02:45:13 -0000 Delivered-To: apmail-devicemap-commits-archive@devicemap.apache.org Received: (qmail 84412 invoked by uid 500); 28 Dec 2014 02:45:13 -0000 Mailing-List: contact commits-help@devicemap.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@devicemap.apache.org Delivered-To: mailing list commits@devicemap.apache.org Received: (qmail 84402 invoked by uid 99); 28 Dec 2014 02:45:13 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Dec 2014 02:45:12 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id BFDBAAC094D; Sun, 28 Dec 2014 02:45:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1648145 - in /devicemap/trunk/examples/ddr-filter/src/main: java/org/apache/devicemap/example/webfilter/IdentificationFilter.java webapp/WEB-INF/oddr.properties Date: Sun, 28 Dec 2014 02:45:12 -0000 To: commits@devicemap.apache.org From: wkeil@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141228024512.BFDBAAC094D@hades.apache.org> Author: wkeil Date: Sun Dec 28 02:45:12 2014 New Revision: 1648145 URL: http://svn.apache.org/r1648145 Log: DMAP-111: Improve Web Examples Task-Url: https://issues.apache.org/jira/browse/DMAP-111 Modified: devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties Modified: devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java?rev=1648145&r1=1648144&r2=1648145&view=diff ============================================================================== --- devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java (original) +++ devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java Sun Dec 28 02:45:12 2014 @@ -63,7 +63,6 @@ public class IdentificationFilter implem try { initializationProperties.load(context.getResourceAsStream("/WEB-INF/oddr.properties")); identificationService = ServiceFactory.newService("org.apache.devicemap.simpleddr.ODDRService", initializationProperties.getProperty(ODDRService.ODDR_VOCABULARY_IRI), initializationProperties); - } catch (Exception ex) { throw new RuntimeException(ex); } @@ -99,7 +98,11 @@ public class IdentificationFilter implem PropertyRef[] propertyRefs = new PropertyRef[] {vendorRef, modelRef, displayWidthRef, displayHeightRef}; Evidence e = new ODDRHTTPEvidence(); - e.put("User-Agent", ((HttpServletRequest)request).getHeader("User-Agent")); +// String userAgent = ((HttpServletRequest)request).getHeader("User-Agent"); +// String userAgent = "Mozilla/5.0 (Linux; Android 4.4.2; nl-nl; SAMSUNG SM-T530 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/1.5 Chrome/28.0.1500.94 Safari/537.36"; + String userAgent = "Mozilla/5.0 (Linux; U; Android 2.2.1; en-us; SAMSUNG-SGH-I997 Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1"; +// System.out.println("User-Agent: " + userAgent); + e.put("User-Agent", userAgent); try { PropertyValues propertyValues = identificationService.getPropertyValues(e, propertyRefs); Modified: devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties?rev=1648145&r1=1648144&r2=1648145&view=diff ============================================================================== --- devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties (original) +++ devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/oddr.properties Sun Dec 28 02:45:12 2014 @@ -8,4 +8,4 @@ ddr.vocabulary.core.path=/temp/devicemap oddr.vocabulary.path=/temp/devicemap-data/devicedata/oddrVocabulary.xml oddr.limited.vocabulary.path=/temp/devicemap-data/devicedata/oddrLimitedVocabulary.xml oddr.vocabulary.device=http://www.openddr.org/oddr-vocabulary -oddr.threshold=70 +oddr.threshold=99