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 187C617B29 for ; Fri, 27 Mar 2015 13:43:47 +0000 (UTC) Received: (qmail 95814 invoked by uid 500); 27 Mar 2015 13:43:37 -0000 Delivered-To: apmail-devicemap-commits-archive@devicemap.apache.org Received: (qmail 95791 invoked by uid 500); 27 Mar 2015 13:43:37 -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 95782 invoked by uid 99); 27 Mar 2015 13:43:37 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Mar 2015 13:43:37 +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 6D766AC006E for ; Fri, 27 Mar 2015 13:43:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1669585 - in /devicemap/trunk/examples/ddr-filter/src/main: java/org/apache/devicemap/example/webfilter/IdentificationFilter.java resources/oddr.properties Date: Fri, 27 Mar 2015 13:43:36 -0000 To: commits@devicemap.apache.org From: wkeil@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150327134337.6D766AC006E@hades.apache.org> Author: wkeil Date: Fri Mar 27 13:43:36 2015 New Revision: 1669585 URL: http://svn.apache.org/r1669585 Log: DMAP-111: Improve Web Examples Tweaking for codemotion demo 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/resources/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=1669585&r1=1669584&r2=1669585&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 Fri Mar 27 13:43:36 2015 @@ -95,7 +95,7 @@ public class IdentificationFilter implem modelRef = identificationService.newPropertyRef("model"); displayWidthRef = identificationService.newPropertyRef("displayWidth"); displayHeightRef = identificationService.newPropertyRef("displayHeight"); -// osVersionRef = identificationService.newPropertyRef("device_os_version"); + osVersionRef = identificationService.newPropertyRef("device_os_version"); } catch (NameException ex) { log.error(ex); throw new RuntimeException(ex); @@ -119,7 +119,7 @@ public class IdentificationFilter implem PropertyValue model = propertyValues.getValue(modelRef); PropertyValue displayWidth = propertyValues.getValue(displayWidthRef); PropertyValue displayHeight = propertyValues.getValue(displayHeightRef); -// PropertyValue osVersion = propertyValues.getValue(osVersionRef); + PropertyValue osVersion = propertyValues.getValue(osVersionRef); log.debug("Vendor: " + vendor + "(" + vendor.exists() + ")"); log.debug("Model: " + model + "(" + model.exists() + ")"); // log.info("OS: " + osVersion + "(" + osVersion.exists() + ")"); Modified: devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties URL: http://svn.apache.org/viewvc/devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties?rev=1669585&r1=1669584&r2=1669585&view=diff ============================================================================== --- devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties (original) +++ devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties Fri Mar 27 13:43:36 2015 @@ -8,4 +8,4 @@ ddr.vocabulary.core.path=${devicemap.dat oddr.vocabulary.path=${devicemap.data.path}/devicedata/oddrVocabulary.xml oddr.limited.vocabulary.path=${devicemap.data.path}/devicedata/oddrLimitedVocabulary.xml oddr.vocabulary.device=http://www.openddr.org/oddr-vocabulary -oddr.threshold=71 +oddr.threshold=70