Modified: incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSourcePatch.xml URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSourcePatch.xml?rev=1580617&r1=1580616&r2=1580617&view=diff ============================================================================== --- incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSourcePatch.xml (original) +++ incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/DeviceDataSourcePatch.xml Sun Mar 23 21:33:13 2014 @@ -17,10 +17,10 @@ --> <ODDR> <version> - <ver>1.22</ver> - <last_updated>2013-10-08 09:31:00</last_updated> + <ver>1.26</ver> + <last_updated>2014-02-20 09:31:00</last_updated> <official_url>http://incubator.apache.org/devicemap</official_url> - <maintainers></maintainers> + <maintainers>wkeil</maintainers> <authors></authors> <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement> </version>
Modified: incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/OperatingSystemDataSource.xml URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/OperatingSystemDataSource.xml?rev=1580617&r1=1580616&r2=1580617&view=diff ============================================================================== --- incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/OperatingSystemDataSource.xml (original) +++ incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/OperatingSystemDataSource.xml Sun Mar 23 21:33:13 2014 @@ -17,10 +17,10 @@ --> <ODDR> <version> - <ver>1.22</ver> - <last_updated>2013-10-08 09:31:00</last_updated> + <ver>1.26</ver> + <last_updated>2014-02-20 09:31:00</last_updated> <official_url>http://incubator.apache.org/devicemap</official_url> - <maintainers></maintainers> + <maintainers>wkeil</maintainers> <authors></authors> <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement> </version> Modified: incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/coreVocabulary.xml URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/coreVocabulary.xml?rev=1580617&r1=1580616&r2=1580617&view=diff ============================================================================== --- incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/coreVocabulary.xml (original) +++ incubator/devicemap/trunk/data/device-data/src/main/resources/devicedata/coreVocabulary.xml Sun Mar 23 21:33:13 2014 @@ -17,10 +17,10 @@ --> <ODDR> <version> - <ver>1.22</ver> - <last_updated>2013-10-08 09:31:00</last_updated> + <ver>1.26</ver> + <last_updated>2014-02-20 09:31:00</last_updated> <official_url>http://incubator.apache.org/devicemap</official_url> - <maintainers></maintainers> + <maintainers>wkeil</maintainers> <authors></authors> <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement> </version> 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=1580617&r1=1580616&r2=1580617&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 Sun Mar 23 21:33:13 2014 @@ -17,10 +17,10 @@ --> <ODDR> <version> - <ver>1.22</ver> - <last_updated>2013-10-08 09:31:00</last_updated> + <ver>1.26</ver> + <last_updated>2014-02-20 09:31:00</last_updated> <official_url>http://incubator.apache.org/devicemap</official_url> - <maintainers></maintainers> + <maintainers>wkeil</maintainers> <authors></authors> <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement> </version> @@ -31,7 +31,7 @@ <Aspect name="device"/> </Aspects> <!-- Properties --> - <Properties> + <Properties> <Property name="vendor" datatype="xs:string" aspects="device" defaultAspect="device"/> <Property name="model" datatype="xs:string" aspects="device" defaultAspect="device"/> <Property name="displayWidth" datatype="xs:nonNegativeInteger" 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=1580617&r1=1580616&r2=1580617&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 Sun Mar 23 21:33:13 2014 @@ -17,10 +17,10 @@ --> <ODDR> <version> - <ver>1.22</ver> - <last_updated>2013-10-08 09:31:00</last_updated> + <ver>1.26</ver> + <last_updated>2014-02-20 09:31:00</last_updated> <official_url>http://incubator.apache.org/devicemap</official_url> - <maintainers></maintainers> + <maintainers>wkeil</maintainers> <authors></authors> <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement> </version> @@ -33,15 +33,9 @@ <Aspect name="operativeSystem"/> <!-- <Aspect name="group"/>--> </Aspects> -<!-- <Variables> - <Variable id="a" vocabulary="http://www.openddr.org/oddr-vocabulary"; name="model" aspect="device" /> - <Variable id="b" vocabulary="http://www.openddr.org/oddr-vocabulary"; name="vendor" aspect="device" /> - <Variable id="c" vocabulary="http://www.openddr.org/oddr-vocabulary"; name="model" aspect="webBrowser" /> - <Variable id="d" vocabulary="http://www.openddr.org/oddr-vocabulary"; name="notApple" aspect="group" /> - </Variables>--> <!-- Properties --> - <Properties> - <!-- Core Property --> + <Properties> + <!-- Core Property --> <!-- <Property name="notApple" datatype="xs:string" aspects="group" defaultAspect="group" expr="$a != 'iPhone'"/> <Property name="isApple" datatype="xs:string" aspects="group" defaultAspect="group" expr="($a == 'iPhone' || $a == 'iPad' || $a == 'iPod touch') and $d == 'true'"/> <Property name="isApple" datatype="xs:string" aspects="group" defaultAspect="group" expr="$a == 'iPhone' || $a == 'iPad' || $a == 'iPod touch'"/>
