18: Streamline Classifier Device with data/W3C terms

Task-Url: OpenDDRmobi/openddr-java#18
OpenDDRmobi · Mar 14, 2021 · 85b4fbe · 85b4fbe
1 parent db3e387
commit 85b4fbe
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 22 deletions.
diff --git a/.project b/.project
@@ -4,4 +4,14 @@
 	<comment></comment>
 	<projects>
 	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
 </projectDescription>
diff --git a/java/classifier/flow/pom.xml b/java/classifier/flow/pom.xml
@@ -9,7 +9,7 @@
    <parent>
         <artifactId>openddr-classifier-examples</artifactId>
         <groupId>mobi.openddr.examples.classifier</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
    <artifactId>openddr-flow</artifactId>
    <packaging>war</packaging>

diff --git a/java/classifier/mvc/pom.xml b/java/classifier/mvc/pom.xml
@@ -2,7 +2,7 @@
 <!--
 
     Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
-    Copyright (c) 2018, 2020 Eclipse Krazo committers and contributors
+    Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
     <parent>
 		<groupId>mobi.openddr.examples.classifier</groupId>
 		<artifactId>openddr-classifier-examples</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
     <artifactId>openddr-mvc-examples</artifactId>
     <packaging>war</packaging>

diff --git a/java/classifier/mvc/src/main/java/mobi/openddr/krazo/test/redirect/ClassifyService.java b/java/classifier/mvc/src/main/java/mobi/openddr/krazo/test/redirect/ClassifyService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 OpenDDR LLC and others. All rights reserved.
+ * Copyright (c) 2011-2021 OpenDDR LLC and others. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
 @ApplicationScoped
 class ClassifyService {
 	// TODO make this configurable
-	private static final String DEFAULT_URL = "http://dl.bintray.com/openddr/ddr/1.33/";
+	private static final String DEFAULT_URL = "http://openddr.mobi/data/latest/";
 
 	private static final Logger log = LogManager.getLogger(ClassifyService.class);
     private Classifier classifier;
@@ -51,10 +51,10 @@ Device classify(String text) {
     }
 
     boolean isWireless(Device device) {
-        return "true".equals(device.getAttribute("is_wireless_device"));
+        return "true".equals(device.getProperty("is_wireless_device"));
     }
 
     boolean isTablet(Device device) {
-    	return "true".equals(device.getAttribute("is_tablet")); 
+    	return "true".equals(device.getProperty("is_tablet")); 
     }
 }
diff --git a/java/classifier/mvc/src/main/java/mobi/openddr/krazo/test/redirect/DeviceInfo.java b/java/classifier/mvc/src/main/java/mobi/openddr/krazo/test/redirect/DeviceInfo.java
@@ -8,6 +8,7 @@
  * Holds device information.
  *
  * @author Ivar Grimstad
+ * @deprecated use openddr-extensions
  */
 @RedirectScoped
 public class DeviceInfo implements Serializable {

diff --git a/java/classifier/pom.xml b/java/classifier/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples</groupId>
 		<artifactId>openddr-java-examples</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<packaging>pom</packaging>

diff --git a/java/classifier/servlet/pom.xml b/java/classifier/servlet/pom.xml
@@ -73,7 +73,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples.classifier</groupId>
 		<artifactId>openddr-classifier-examples</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 
 		<!-- Additional repositories -->

diff --git a/java/classifier/servlet/src/main/java/mobi/openddr/example/servlet/ClassifyServlet.java b/java/classifier/servlet/src/main/java/mobi/openddr/example/servlet/ClassifyServlet.java
@@ -39,7 +39,7 @@ public class ClassifyServlet extends HttpServlet {
 	 */
 	private static final long serialVersionUID = -5231604595735057872L;
 
-	private static final String DEFAULT_URL = "http://dl.bintray.com/openddr/ddr/1.33/";
+	private static final String DEFAULT_URL = "http://dl.bintray.com/openddr/ddr/1.34/";
 
 	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response)

diff --git a/java/classifier/spring/pom.xml b/java/classifier/spring/pom.xml
@@ -97,6 +97,6 @@
     <parent>
     	<artifactId>openddr-classifier-examples</artifactId>
     	<groupId>mobi.openddr.examples.classifier</groupId>
-    	<version>1.1.0-SNAPSHOT</version>
+    	<version>1.1.0</version>
     </parent>
 </project>
diff --git a/java/gwt/gwt-model/pom.xml b/java/gwt/gwt-model/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples</groupId>
 		<artifactId>gwt</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>gwt-model</artifactId>
 	<name>Sample GWT - Model</name>

diff --git a/java/gwt/gwt-shared/pom.xml b/java/gwt/gwt-shared/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples</groupId>
 		<artifactId>gwt</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>gwt-shared</artifactId>
 	<name>Sample GWT - Shared classes</name>

diff --git a/java/gwt/gwt-web/pom.xml b/java/gwt/gwt-web/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples</groupId>
 		<artifactId>gwt</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>gwt-web</artifactId>
 	<packaging>war</packaging>

diff --git a/java/gwt/pom.xml b/java/gwt/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
         <artifactId>openddr-java-examples</artifactId>
         <groupId>mobi.openddr.examples</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
 	<groupId>mobi.openddr.examples</groupId>
 	<artifactId>gwt</artifactId>

diff --git a/java/pom.xml b/java/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples</groupId>
 		<artifactId>openddr-examples</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 
 	<artifactId>openddr-java-examples</artifactId>

diff --git a/java/w3c/console/pom.xml b/java/w3c/console/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples.w3c</groupId>
 		<artifactId>openddr-w3c-examples</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>openddr-w3c-console</artifactId>
 	<name>OpenDDR W3C DDR Simple Console</name>

diff --git a/java/w3c/filter/pom.xml b/java/w3c/filter/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples.w3c</groupId>
 		<artifactId>openddr-w3c-examples</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<artifactId>openddr-w3c-filter</artifactId>
 	<packaging>war</packaging>

diff --git a/java/w3c/pom.xml b/java/w3c/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples</groupId>
 		<artifactId>openddr-java-examples</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<groupId>mobi.openddr.examples.w3c</groupId>
 	<artifactId>openddr-w3c-examples</artifactId>
@@ -36,7 +36,7 @@
 			<dependency>
 				<groupId>mobi.openddr</groupId>
 				<artifactId>openddr-data</artifactId>
-				<version>1.33</version>
+				<version>1.34</version>
 			</dependency>
 			<dependency>
 				<groupId>mobi.openddr.client</groupId>

diff --git a/java/w3c/service/pom.xml b/java/w3c/service/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>mobi.openddr.examples.w3c</groupId>
 		<artifactId>openddr-w3c-examples</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.1.0</version>
 	</parent>
 	<properties>
 		<devicemap.data.path>/temp/openddr-data</devicemap.data.path>

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 	<groupId>mobi.openddr.examples</groupId>
 	<artifactId>openddr-examples</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<name>OpenDDR Examples</name>
 	<description>OpenDDR Examples</description>
 	<url>http://openddr.mobi/</url>