You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by re...@apache.org on 2014/08/05 03:39:12 UTC
svn commit: r1615834 - in /incubator/devicemap/trunk:
data/device-data/src/main/resources/devicedata/
devicemap/java/classifier/src/test/resources/
Author: rezan
Date: Tue Aug 5 01:39:12 2014
New Revision: 1615834
URL: http://svn.apache.org/r1615834
Log:
removed is_crawler
Modified:
incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSource.xml
incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSource.xml
incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrLimitedVocabulary.xml
incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrVocabulary.xml
incubator/devicemap/trunk/devicemap/java/classifier/src/test/resources/uas.data
Modified: incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSource.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSource.xml?rev=1615834&r1=1615833&r2=1615834&view=diff
==============================================================================
--- incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSource.xml (original)
+++ incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSource.xml Tue Aug 5 01:39:12 2014
@@ -81,8 +81,8 @@
</list>
</device>
</builder>
- <builder class="org.apache.devicemap.simpleddr.builder.device.WebCrawlerBuilder">
- <device id="genericCrawler">
+ <builder class="org.apache.devicemap.simpleddr.builder.device.BotBuilder">
+ <device id="genericWebBot">
<list>
<value>Slurp</value>
<value>Feedfetcher</value>
Modified: incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSource.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSource.xml?rev=1615834&r1=1615833&r2=1615834&view=diff
==============================================================================
--- incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSource.xml (original)
+++ incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSource.xml Tue Aug 5 01:39:12 2014
@@ -12671,7 +12671,6 @@
<property name="model" value="-"/>
<property name="xhtml_format_as_attribute" value="false"/>
<property name="is_tablet" value="false"/>
- <property name="is_crawler" value="false"/>
<property name="is_desktop" value="false"/>
<property name="is_bot" value="false"/>
<property name="image_inlining" value="false"/>
@@ -12680,8 +12679,7 @@
<property name="xhtml_format_as_css_property" value="false"/>
<property name="ajax_support_javascript" value="false"/>
</device>
- <device id="genericCrawler" parentId="generic-">
- <property name="is_crawler" value="true"/>
+ <device id="genericWebBot" parentId="generic-">
<property name="is_bot" value="true"/>
<property name="is_wireless_device" value="false"/>
</device>
Modified: incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrLimitedVocabulary.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrLimitedVocabulary.xml?rev=1615834&r1=1615833&r2=1615834&view=diff
==============================================================================
--- incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrLimitedVocabulary.xml (original)
+++ incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrLimitedVocabulary.xml Tue Aug 5 01:39:12 2014
@@ -50,7 +50,6 @@
<Property name="is_wireless_device" datatype="xs:string" aspects="device" defaultAspect="device"/>
<Property name="is_tablet" datatype="xs:string" aspects="device" defaultAspect="device"/>
<Property name="is_desktop" datatype="xs:string" aspects="device" defaultAspect="device"/>
- <Property name="is_crawler" datatype="xs:string" aspects="device" defaultAspect="device"/>
<Property name="is_bot" datatype="xs:string" aspects="device" defaultAspect="device"/>
<Property name="ajax_support_javascript" datatype="xs:string" aspects="device" defaultAspect="device"/>
<Property name="ajax_support_getelementbyid" datatype="xs:string" aspects="device" defaultAspect="device"/>
Modified: incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrVocabulary.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrVocabulary.xml?rev=1615834&r1=1615833&r2=1615834&view=diff
==============================================================================
--- incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrVocabulary.xml (original)
+++ incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/oddrVocabulary.xml Tue Aug 5 01:39:12 2014
@@ -86,7 +86,6 @@
<Property aspects="device" datatype="xs:string" defaultAspect="device" name="from"/>
<!-- DeviceMap property -->
<Property aspects="device" datatype="xs:boolean" defaultAspect="device" name="is_desktop"/>
- <Property aspects="device" datatype="xs:boolean" defaultAspect="device" name="is_crawler"/>
<Property aspects="device" datatype="xs:boolean" defaultAspect="device" name="is_bot"/>
</Properties>
</VocabularyDescription>
Modified: incubator/devicemap/trunk/devicemap/java/classifier/src/test/resources/uas.data
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/devicemap/java/classifier/src/test/resources/uas.data?rev=1615834&r1=1615833&r2=1615834&view=diff
==============================================================================
--- incubator/devicemap/trunk/devicemap/java/classifier/src/test/resources/uas.data (original)
+++ incubator/devicemap/trunk/devicemap/java/classifier/src/test/resources/uas.data Tue Aug 5 01:39:12 2014
@@ -752,8 +752,8 @@ BlackBerry9810/7.1.0.694 Profile/MIDP-2.
curl/7.17.1 (x86_64-redhat-linux-gnu) libcurl/7.17.1 NSS/3.11.7.1 zlib/1.2.3 libidn/0.6.14||unknown
curl/7.21.0 (x86_64-pc-linux-gnu) libcurl/7.21.0 OpenSSL/0.9.8o zlib/1.2.3.4 libidn/1.15 libssh2/1.2.6||unknown
Dalvik/1.6.0 (Linux; U; Android 4.0.4; GT-N7000 Build/IMM76D)||GT-N7000
-Feedfetcher-Google; (+http://www.google.com/feedfetcher.html; 1 subscribers; feed-id=3694668351925170997)||genericCrawler
-Feedfetcher-Google; (+http://www.google.com/feedfetcher.html; feed-id=15980777345834154950)||genericCrawler
+Feedfetcher-Google; (+http://www.google.com/feedfetcher.html; 1 subscribers; feed-id=3694668351925170997)||genericWebBot
+Feedfetcher-Google; (+http://www.google.com/feedfetcher.html; feed-id=15980777345834154950)||genericWebBot
Java/1.6.0_31||unknown
JUC(Linux;U;Android2.3.5;Zh_cn;HTC HD2;480*800;)UCWEB7.8.0.95/139/352||HTC HD2
JUC(Linux;U;Android2.3.7;Zh_cn;LT22i;540*960;)UCWEB7.8.0.95/139/351||SonyEricssonLT22i
@@ -783,7 +783,7 @@ LG-LX260 EMBIDER-LX260/2.0 MMP/2.0 Profi
MOT-W409G/06.38.00[TF012782003645271007050014174489323] Obigo/Q03C MMP/2.0||unknown
MOT-WX416/03.03.0F Obigo/Q03C MMP/2.0||unknown
Mozilla/4.0 (BREW 3.1.5; U; en-us; Sanyo; NetFront/3.5.1/AMB) Boost SCP6760||SCP6760
-Mozilla/4.0 (compatible; +Baiduspider/2.0;++http://www.baidu.com/search/spider.html +Googlebot/2.1;++http://www.google.com/bot.html)||genericCrawler
+Mozilla/4.0 (compatible; +Baiduspider/2.0;++http://www.baidu.com/search/spider.html +Googlebot/2.1;++http://www.google.com/bot.html)||genericWebBot
Mozilla/4.0 (compatible; GoogleToolbar 7.4.3230.2052; Windows 6.1; MSIE 9.0.8112.16421)||desktopDevice
Mozilla/4.0 (compatible; MSIE 6.0; Windows XP) Webmetrics||desktopDevice
Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; HTC; 7 Mozart T8698)||7 Mozart
@@ -815,8 +815,8 @@ Mozilla/5.0 (BlackBerry; U; BlackBerry 9
Mozilla/5.0 (BlackBerry; U; BlackBerry 9930; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.1.0.267 Mobile Safari/534.11+||BlackBerry 9930
Mozilla/5.0 (BlackBerry; U; BlackBerry 9930; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.1.0.342 Mobile Safari/534.11+||BlackBerry 9930
Mozilla/5.0 (compatible; 008/0.83; http://www.80legs.com/webcrawler.html;) Gecko/2008032620||desktopDevice
-Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)||genericCrawler
-Mozilla/5.0 (compatible; Blekkobot; ScoutJet; +http://blekko.com/about/blekkobot)||genericCrawler
+Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)||genericWebBot
+Mozilla/5.0 (compatible; Blekkobot; ScoutJet; +http://blekko.com/about/blekkobot)||genericWebBot
Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; HTC; HTC6990LVW)||HTC-Touch
Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; HTC; PM23300)||HTC-Touch
Mozilla/5.0 (compatible; MSIE 6.0; BREW 4.0.3; en )/800x480 Samsung sam-r900||desktopDevice
@@ -1045,7 +1045,7 @@ Mozilla/5.0 (SymbianOS/9.4; Series60/5.0
Mozilla/5.0 (webOS/1.4.5; U; en-US) AppleWebKit/532.2 (KHTML, like Gecko) Version/1.0 Safari/532.2 Pre/1.0||Pre/1.0
Mozilla/5.0 (Windows; U; en-US) AppleWebKit/533.19.4 (KHTML, like Gecko) AdobeAIR/3.4||desktopDevice
Mozilla/5.0 (Windows; U; Win 9x 4.90; en-US; rv:1.0.1) Gecko/20020823 Netscape/7.0||desktopDevice
-msnbot/2.0b (+http://search.msn.com/msnbot.htm)||genericCrawler
+msnbot/2.0b (+http://search.msn.com/msnbot.htm)||genericWebBot
NetFront/3.5.1(BREW 5.0.2.1; U; en-us; SAMSUNG; NetFront/3.5.1/WAP) Sprint M370 MMP/2.0 Profile/MIDP-2.1 Configuration/CLDC-1.1||Sprint M370
NokiaC3-00/5.0 (08.70) Profile/MIDP-2.1 Configuration/CLDC-1.1 Mozilla/5.0 AppleWebKit/420+ (KHTML, like Gecko) Safari/420+||NokiaC3
Opera/9.80 (Android 2.3.3; Linux; Opera Mobi/ADR-1207201819; U; es-ES) Presto/2.10.254 Version/12.00||genericTouchPhone