You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by wk...@apache.org on 2014/07/30 21:57:53 UTC

svn commit: r1614753 - in /incubator/devicemap/trunk/examples/ddr-filter/src: main/resources/oddr.properties main/webapp/WEB-INF/lib/ main/webapp/WEB-INF/lib/w3c.jar main/webapp/WEB-INF/web.xml main/webapp/index.jsp test/ test/java/

Author: wkeil
Date: Wed Jul 30 19:57:53 2014
New Revision: 1614753

URL: http://svn.apache.org/r1614753
Log:
DMAP-35: Refactor Simple DDR 
Adding simple DDR filter example
Task-Url: https://issues.apache.org/jira/browse/DMAP-35

Added:
    incubator/devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties
    incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/lib/
    incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/lib/w3c.jar   (with props)
    incubator/devicemap/trunk/examples/ddr-filter/src/test/
    incubator/devicemap/trunk/examples/ddr-filter/src/test/java/
Modified:
    incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/web.xml
    incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/index.jsp

Added: incubator/devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties?rev=1614753&view=auto
==============================================================================
--- incubator/devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties (added)
+++ incubator/devicemap/trunk/examples/ddr-filter/src/main/resources/oddr.properties Wed Jul 30 19:57:53 2014
@@ -0,0 +1,11 @@
+oddr.ua.device.builder.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/BuilderDataSource.xml
+oddr.ua.device.datasource.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/DeviceDataSource.xml
+oddr.ua.device.builder.patch.paths=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/BuilderDataSourcePatch.xml
+oddr.ua.device.datasource.patch.paths=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/DeviceDataSourcePatch.xml
+oddr.ua.browser.datasource.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/BrowserDataSource.xml
+oddr.ua.operatingSystem.datasource.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/OperatingSystemDataSource.xml
+ddr.vocabulary.core.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/coreVocabulary.xml
+oddr.vocabulary.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/oddrVocabulary.xml
+oddr.limited.vocabulary.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/devicedata/oddrLimitedVocabulary.xml
+oddr.vocabulary.device=http://www.openddr.org/oddr-vocabulary
+oddr.threshold=70

Added: incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/lib/w3c.jar
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/lib/w3c.jar?rev=1614753&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/lib/w3c.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/web.xml?rev=1614753&r1=1614752&r2=1614753&view=diff
==============================================================================
--- incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/devicemap/trunk/examples/ddr-filter/src/main/webapp/WEB-INF/web.xml Wed Jul 30 19:57:53 2014
@@ -1,7 +1,17 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-
-<web-app>
-  <display-name>Archetype Created Web Application</display-name>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+  <display-name>DeviceMap DDR Sample WebApp</display-name>
+  <filter>
+    <filter-name>DDRFilter</filter-name>
+    <filter-class> org.apache.devicemap.example.ddrfilter.DDRFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>DDRFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <session-config>
+    <session-timeout>30</session-timeout>
+  </session-config>
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
 </web-app>

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=1614753&r1=1614752&r2=1614753&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 Wed Jul 30 19:57:53 2014
@@ -1,5 +1,13 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+
 <html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>DeviceMap Simple DDR Sample</title>
+    </head>
+    <body>
+        <h1>${vendor} ${model} resolution: ${displayWidth} x ${displayHeight}</h1>
+    </body>
+</html>
\ No newline at end of file