Author: wkeil
Date: Fri Mar 21 02:21:45 2014
New Revision: 1579869
URL: http://svn.apache.org/r1579869
Log:
OPEN - issue DMAP-35: Refactor Simple DDR
https://issues.apache.org/jira/browse/DMAP-35
Added:
incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/WEB-INF/oddr.properties
Removed:
incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/WEB-INF/lib/DDR-Simple-API.jar
Modified:
incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/ClassificationFilter.java
incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/index.jsp
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/controller/Service.java
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/webapp/WEB-INF/oddr.properties
Modified:
incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/ClassificationFilter.java
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/ClassificationFilter.java?rev=1579869&r1=1579868&r2=1579869&view=diff
==============================================================================
---
incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/ClassificationFilter.java
(original)
+++
incubator/devicemap/trunk/contrib/web/webfilter/src/main/java/org/apache/devicemap/example/webfilter/ClassificationFilter.java
Fri Mar 21 02:21:45 2014
@@ -2,6 +2,7 @@ package org.apache.devicemap.example.web
import java.io.IOException;
import java.util.Properties;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -10,8 +11,7 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-//import org.openddr.simpleapi.oddr.ODDRService;
-//import org.openddr.simpleapi.oddr.model.ODDRHTTPEvidence;
+
import org.w3c.ddr.simple.Evidence;
import org.w3c.ddr.simple.PropertyRef;
import org.w3c.ddr.simple.PropertyValue;
@@ -20,6 +20,7 @@ import org.w3c.ddr.simple.Service;
import org.w3c.ddr.simple.ServiceFactory;
import org.w3c.ddr.simple.exception.NameException;
import org.apache.devicemap.client.DeviceMapClient;
+import org.apache.devicemap.simpleddr.ODDRService;
/**
* Servlet Filter implementation class ClassificationFilter
@@ -44,7 +45,7 @@ public class ClassificationFilter implem
try {
initializationProperties.load(context.getResourceAsStream("/WEB-INF/oddr.properties"));
-// identificationService =
ServiceFactory.newService("org.openddr.simpleapi.oddr.ODDRService",
initializationProperties.getProperty(ODDRService.ODDR_VOCABULARY_IRI),
initializationProperties);
+ identificationService =
ServiceFactory.newService("org.apache.devicemap.simpleddr.ODDRService",
initializationProperties.getProperty(ODDRService.ODDR_VOCABULARY_IRI),
initializationProperties);
client = new DeviceMapClient();
} catch (Exception ex) {
Added:
incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/WEB-INF/oddr.properties
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/WEB-INF/oddr.properties?rev=1579869&view=auto
==============================================================================
---
incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/WEB-INF/oddr.properties
(added)
+++
incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/WEB-INF/oddr.properties
Fri Mar 21 02:21:45 2014
@@ -0,0 +1,11 @@
+oddr.ua.device.builder.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/BuilderDataSource.xml
+oddr.ua.device.datasource.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/DeviceDataSource.xml
+oddr.ua.device.builder.patch.paths=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/BuilderDataSourcePatch.xml
+oddr.ua.device.datasource.patch.paths=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/DeviceDataSourcePatch.xml
+oddr.ua.browser.datasource.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/BrowserDataSource.xml
+oddr.ua.operatingSystem.datasource.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/OperatingSystemDataSource.xml
+ddr.vocabulary.core.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/coreVocabulary.xml
+oddr.vocabulary.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/oddrVocabulary.xml
+oddr.limited.vocabulary.path=C:/Users/Werner/workspace/jds7/mobile/devicemap/device-data/src/main/resources/oddrLimitedVocabulary.xml
+oddr.vocabulary.device=http://www.openddr.org/oddr-vocabulary
+oddr.threshold=70
Modified:
incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/index.jsp?rev=1579869&r1=1579868&r2=1579869&view=diff
==============================================================================
--- incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/index.jsp
(original)
+++ incubator/devicemap/trunk/contrib/web/webfilter/src/main/webapp/index.jsp
Fri Mar 21 02:21:45 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
Modified:
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/controller/Service.java
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/controller/Service.java?rev=1579869&r1=1579868&r2=1579869&view=diff
==============================================================================
---
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/controller/Service.java
(original)
+++
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/controller/Service.java
Fri Mar 21 02:21:45 2014
@@ -24,9 +24,7 @@ import org.springframework.stereotype.Co
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.beans.factory.annotation.Autowired;
@Controller
@RequestMapping("/service")
Modified:
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java?rev=1579869&r1=1579868&r2=1579869&view=diff
==============================================================================
---
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java
(original)
+++
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/java/org/apache/devicemapjavaservice/filter/IdentificationFilter.java
Fri Mar 21 02:21:45 2014
@@ -53,7 +53,7 @@ public class IdentificationFilter implem
try {
initializationProperties.load(context.getResourceAsStream("/WEB-INF/oddr.properties"));
- identificationService =
ServiceFactory.newService("org.openddr.simpleapi.oddr.ODDRService",
initializationProperties.getProperty(ODDRService.ODDR_VOCABULARY_IRI),
initializationProperties);
+ identificationService =
ServiceFactory.newService("org.apache.devicemap.simpleddr.ODDRService",
initializationProperties.getProperty(ODDRService.ODDR_VOCABULARY_IRI),
initializationProperties);
} catch (Exception ex) {
throw new RuntimeException(ex);
Modified:
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/webapp/WEB-INF/oddr.properties
URL:
http://svn.apache.org/viewvc/incubator/devicemap/trunk/contrib/web/webservice-java/src/main/webapp/WEB-INF/oddr.properties?rev=1579869&r1=1579868&r2=1579869&view=diff
==============================================================================
---
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/webapp/WEB-INF/oddr.properties
(original)
+++
incubator/devicemap/trunk/contrib/web/webservice-java/src/main/webapp/WEB-INF/oddr.properties
Fri Mar 21 02:21:45 2014
@@ -1,11 +1,11 @@
-oddr.ua.device.builder.path=/home/rezan/OpenDDR/latest/resources/BuilderDataSource.xml
-oddr.ua.device.datasource.path=/home/rezan/OpenDDR/latest/resources/DeviceDataSource.xml
-oddr.ua.device.builder.patch.paths=/home/rezan/OpenDDR/latest/resources/BuilderDataSourcePatch.xml
-oddr.ua.device.datasource.patch.paths=/home/rezan/OpenDDR/latest/resources/DeviceDataSourcePatch.xml
-oddr.ua.browser.datasource.path=/home/rezan/OpenDDR/latest/resources/BrowserDataSource.xml
-oddr.ua.operatingSystem.datasource.path=/home/rezan/OpenDDR/latest/resources/OperatingSystemDataSource.xml
-ddr.vocabulary.core.path=/home/rezan/OpenDDR/latest/resources/coreVocabulary.xml
-oddr.vocabulary.path=/home/rezan/OpenDDR/latest/resources/oddrVocabulary.xml
-oddr.limited.vocabulary.path=/home/rezan/OpenDDR/latest/resources/oddrLimitedVocabulary.xml
+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
