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 01:23:44 UTC
svn commit: r1615824 - in
/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata:
BuilderDataSource.xml BuilderDataSourcePatch.xml DeviceDataSource.xml
Author: rezan
Date: Mon Aug 4 23:23:43 2014
New Revision: 1615824
URL: http://svn.apache.org/r1615824
Log:
moved generic patterns to core builders
Modified:
incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSource.xml
incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSourcePatch.xml
incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSource.xml
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=1615824&r1=1615823&r2=1615824&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 Mon Aug 4 23:23:43 2014
@@ -28,6 +28,80 @@
<statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
</version>
<Builders>
+ <builder class="org.apache.devicemap.simpleddr.builder.device.DesktopOSDeviceBuilder">
+ <!--<device id="appleDesktop">-->
+ <device id="desktopDevice">
+ <list>
+ <value>macintosh</value>
+ </list>
+ </device>
+ <!--<device id="windowsDesktop">-->
+ <device id="desktopDevice">
+ <list>
+ <value>windows nt</value>
+ </list>
+ </device>
+ <!--<device id="linuxDesktop">-->
+ <device id="desktopDevice">
+ <list>
+ <value>x11</value>
+ </list>
+ </device>
+ </builder>
+ <builder class="org.apache.devicemap.simpleddr.builder.device.SimpleDeviceBuilder">
+ <device id="genericPhone">
+ <list>
+ <value>LG</value>
+ <value>NetFront</value>
+ <value>Palm</value>
+ <value>SAMSUNG-SGH</value>
+ <value>Up.Browser</value>
+ <value>Windows CE</value>
+ <value>Windows CE; IEMobile</value>
+ </list>
+ </device>
+ <device id="genericTouchPhone">
+ <list>
+ <value>android</value>
+ <value>blackberry</value>
+ </list>
+ </device>
+ <device id="desktopDevice">
+ <list>
+ <value>Mozilla/4.0</value>
+ <value>Mozilla/5.0 .compatible</value>
+ <value>Mozilla/5.0 .Windows</value>
+ <value>Mozilla/5.0 .Macintosh</value>
+ <value>Mozilla/5.0 .X11</value>
+ <value>Mozilla/5.0 .Ubuntu</value>
+ <value>Opera</value>
+ <value>Safari</value>
+ <value>Chrome</value>
+ <value>Konqueror</value>
+ </list>
+ </device>
+ </builder>
+ <builder class="org.apache.devicemap.simpleddr.builder.device.WebCrawlerBuilder">
+ <device id="genericCrawler">
+ <list>
+ <value>Slurp</value>
+ <value>Feedfetcher</value>
+ <value>Googlebot</value>
+ <value>bingbot</value>
+ <value>Baiduspider</value>
+ <value>msnbot</value>
+ <value>YandexBot</value>
+ <value>proximic</value>
+ <value>YoudaoBot</value>
+ <value>Genieo</value>
+ <value>heritrix</value>
+ <value>facebookexternalhit</value>
+ <value>Sosospider</value>
+ <value>CrystalSemanticsBot</value>
+ <value>Blekkobot</value>
+ </list>
+ </device>
+ </builder>
<builder class="org.apache.devicemap.simpleddr.builder.device.AndroidDeviceBuilder">
<device id="D5316">
<list>
Modified: incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSourcePatch.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSourcePatch.xml?rev=1615824&r1=1615823&r2=1615824&view=diff
==============================================================================
--- incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSourcePatch.xml (original)
+++ incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/BuilderDataSourcePatch.xml Mon Aug 4 23:23:43 2014
@@ -26,32 +26,6 @@
</version>
<Builders>
<builder class="org.apache.devicemap.simpleddr.builder.device.AndroidDeviceBuilder">
- <device id="desktopDevice">
- <list>
- <value>macintosh</value>
- <value>windows nt</value>
- <value>x11</value>
- </list>
- </device>
- <device id="genericCrawler">
- <list>
- <value>Slurp</value>
- <value>Feedfetcher</value>
- <value>Googlebot</value>
- <value>bingbot</value>
- <value>Baiduspider</value>
- <value>msnbot</value>
- <value>YandexBot</value>
- <value>proximic</value>
- <value>YoudaoBot</value>
- <value>Genieo</value>
- <value>heritrix</value>
- <value>facebookexternalhit</value>
- <value>Sosospider</value>
- <value>CrystalSemanticsBot</value>
- <value>Blekkobot</value>
- </list>
- </device>
</builder>
<builder class="org.apache.devicemap.simpleddr.builder.device.WinPhoneDeviceBuilder">
</builder>
@@ -60,37 +34,6 @@
<builder class="org.apache.devicemap.simpleddr.builder.device.TwoStepDeviceBuilder">
</builder>
<builder class="org.apache.devicemap.simpleddr.builder.device.SimpleDeviceBuilder">
- <device id="genericPhone">
- <list>
- <value>LG</value>
- <value>NetFront</value>
- <value>Palm</value>
- <value>SAMSUNG-SGH</value>
- <value>Up.Browser</value>
- <value>Windows CE</value>
- <value>Windows CE; IEMobile</value>
- </list>
- </device>
- <device id="genericTouchPhone">
- <list>
- <value>android</value>
- <value>blackberry</value>
- </list>
- </device>
- <device id="desktopDevice">
- <list>
- <value>Mozilla/4.0</value>
- <value>Mozilla/5.0 .compatible</value>
- <value>Mozilla/5.0 .Windows</value>
- <value>Mozilla/5.0 .Macintosh</value>
- <value>Mozilla/5.0 .X11</value>
- <value>Mozilla/5.0 .Ubuntu</value>
- <value>Opera</value>
- <value>Safari</value>
- <value>Chrome</value>
- <value>Konqueror</value>
- </list>
- </device>
</builder>
</Builders>
</ODDR>
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=1615824&r1=1615823&r2=1615824&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 Mon Aug 4 23:23:43 2014
@@ -12708,6 +12708,10 @@
<property name="device_os" value="OSX"/>
<property name="vendor" value="Apple"/>
</device>
+ <device id="linuxDesktop" parentId="genericDesktop">
+ <property name="device_os" value="OSX"/>
+ <property name="vendor" value="Apple"/>
+ </device>
<device id="genericPhone" parentId="generic-">
<property name="displayHeight" value="200"/>
<property name="displayWidth" value="100"/>