Return-Path: X-Original-To: apmail-incubator-devicemap-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-devicemap-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C8EEBCB77 for ; Sat, 15 Nov 2014 22:39:01 +0000 (UTC) Received: (qmail 5385 invoked by uid 500); 15 Nov 2014 22:39:01 -0000 Delivered-To: apmail-incubator-devicemap-commits-archive@incubator.apache.org Received: (qmail 5362 invoked by uid 500); 15 Nov 2014 22:39:01 -0000 Mailing-List: contact devicemap-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: devicemap-dev@incubator.apache.org Delivered-To: mailing list devicemap-commits@incubator.apache.org Received: (qmail 5353 invoked by uid 99); 15 Nov 2014 22:39:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Nov 2014 22:39:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Nov 2014 22:38:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D10E32388A3B; Sat, 15 Nov 2014 22:38:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1639933 - in /incubator/devicemap/trunk/examples/ddr-filter/src/main: java/org/apache/devicemap/example/webfilter/IdentificationFilter.java webapp/index.jsp Date: Sat, 15 Nov 2014 22:38:09 -0000 To: devicemap-commits@incubator.apache.org From: wkeil@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141115223809.D10E32388A3B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wkeil Date: Sat Nov 15 22:38:09 2014 New Revision: 1639933 URL: http://svn.apache.org/r1639933 Log: DMAP-53: This is an epic for tasks or issues related to examples Task-Url: https://issues.apache.org/jira/browse/DMAP-53 Modified: incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp Modified: incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java?rev=1639933&r1=1639932&r2=1639933&view=diff ============================================================================== --- incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java (original) +++ incubator/devicemap/trunk/examples/ddr-filter/src/main/java/org/apache/devicemap/example/webfilter/IdentificationFilter.java Sat Nov 15 22:38:09 2014 @@ -105,9 +105,6 @@ public class IdentificationFilter implem System.out.println("H: " + displayHeight + "(" + displayHeight.exists() + ")"); request.setAttribute("displayHeight", displayHeight.getInteger()); } - - request.setAttribute("vendor", - "dummy vendor"); } catch (Exception ex) { System.err.println(ex.getLocalizedMessage()); throw new RuntimeException(ex); Modified: incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp?rev=1639933&r1=1639932&r2=1639933&view=diff ============================================================================== --- incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp (original) +++ incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp Sat Nov 15 22:38:09 2014 @@ -8,6 +8,7 @@ DeviceMap Simple DDR Sample -

${vendor} ${model} resolution: <%= request.getAttribute("displayWidth") %> x <%= request.getAttribute("displayHeight") %>

+

<%= (request.getAttribute("vendor") != null ? request.getAttribute("vendor") : "No vendor") %> + <%= (request.getAttribute("model") != null ? request.getAttribute("model") : "No model") %> resolution: <%= request.getAttribute("displayWidth") %> x <%= request.getAttribute("displayHeight") %>

\ No newline at end of file