Commit 0657f8dcc62153145bb9716a1cb79dfb42214c3c

Authored by Joerg Swetina
2 parents 19b265da adc09257

Merge branch 'Creating_version_3_4' into 'master'

Version 3.4.0 of the base ontology



See merge request !7
Showing 1 changed file with 79 additions and 361 deletions
... ... @@ -5,10 +5,10 @@
5 5 xmlns:owl="http://www.w3.org/2002/07/owl#"
6 6 xmlns:xml="http://www.w3.org/XML/1998/namespace"
7 7 xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
8   - xmlns:base_ontology="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#"
9   - xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
  8 + xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
  9 + xmlns:BO="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#">
10 10 <Ontology rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology">
11   - <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_3_0"/>
  11 + <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_4_0"/>
12 12 <rdfs:comment>This file contains the Base Ontology of oneM2M as specified in TS-0012
13 13  
14 14 =========================================
... ... @@ -165,14 +165,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
165 165 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasInputDataPoint -->
166 166  
167 167 <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasInputDataPoint">
168   - <rdfs:domain>
169   - <Class>
170   - <unionOf rdf:parseType="Collection">
171   - <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
172   - <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
173   - </unionOf>
174   - </Class>
175   - </rdfs:domain>
  168 + <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
176 169 <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#InputDataPoint"/>
177 170 <rdfs:comment>A Service or an Operation of a Service of the Device can have InputDataPoints. Communicating entities write data into InputDataPoints and the Device retrieves the data at times according to an internal schedule.
178 171 - An InputDataPoint is a persistent resource</rdfs:comment>
... ... @@ -213,16 +206,6 @@ the cardinality of hasOperation must be - min 1.&lt;/rdfs:comment&gt;
213 206  
214 207  
215 208  
216   - <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOperationState -->
217   -
218   - <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOperationState">
219   - <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
220   - <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationState"/>
221   - <rdfs:comment>An Operation may have an OperationState that is exposed</rdfs:comment>
222   - </ObjectProperty>
223   -
224   -
225   -
226 209 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutput -->
227 210  
228 211 <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutput">
... ... @@ -243,14 +226,7 @@ the cardinality of hasOperation must be - min 1.&lt;/rdfs:comment&gt;
243 226 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutputDataPoint -->
244 227  
245 228 <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutputDataPoint">
246   - <rdfs:domain>
247   - <Class>
248   - <unionOf rdf:parseType="Collection">
249   - <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
250   - <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
251   - </unionOf>
252   - </Class>
253   - </rdfs:domain>
  229 + <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
254 230 <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint"/>
255 231 <rdfs:comment>A Service or an Operation of a Service of the Device can have OutputDataPoints. The Device writes data into OutputDataPoints at times according to an internal schedule and the communicating entitis retrieves the data.
256 232 - An OutputDataPoint is a persistent resource</rdfs:comment>
... ... @@ -357,37 +333,15 @@ The Data Property &amp;quot;hasDataRestriction&amp;quot; shall always be sub-classed&lt;/rd
357 333  
358 334  
359 335  
360   - <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_langRange -->
361   -
362   - <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_langRange">
363   - <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
364   - <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
365   - <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
366   - <rdfs:comment>This Data Property specifies the restrictions on the data type rdf:PlainLiteral of the SimpleTypeVariable to subset a of strings containing a language tag defind by this restriction.
367   -E.g. the subset of the value space of rdf:PlainLiteral corresponding to the facet pair ( rdf:langRange &quot;de-DE&quot; ) contains the pairs &lt; &quot;abc&quot; , &quot;de-de&quot; &gt; and &lt; &quot;abc&quot; , &quot;de-de-1996&quot; &gt; (because these match the language range &quot;de-DE&quot; according to RFC 4647), but not the string &quot;abc&quot; (because it is not a pair with a language tag) or the pairs &lt; &quot;abc&quot; , &quot;de-deva&quot; &gt; and &lt; &quot;abc&quot; , &quot;de-latn-de&quot; &gt; (because these do not match the language range &quot;de-DE&quot; according to RFC 4647)</rdfs:comment>
368   - </DatatypeProperty>
369   -
370   -
371   -
372 336 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_length -->
373 337  
374 338 <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_length">
375 339 <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
376 340 <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
377   - <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#long"/>
  341 + <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
378 342 <rdfs:comment>This Data Property specifies the exact number of characters or list items allowed of the SimpleTypeVariable. Must be equal to or greater than zero.
379 343 it applies to:
380   -- rdf:PlainLiteral
381   -- xsd:string
382   -- xsd:normalizedString
383   -- xsd:token
384   -- xsd:language
385   -- xsd:Name
386   -- xsd:NCName
387   -- xsd:NMTOKEN
388   -- xsd:anyURI
389   -- xsd:hexBinary
390   -- xsd:base64Binary</rdfs:comment>
  344 +- xs:string</rdfs:comment>
391 345 </DatatypeProperty>
392 346  
393 347  
... ... @@ -400,45 +354,15 @@ it applies to:
400 354 <rdfs:range>
401 355 <rdfs:Datatype>
402 356 <unionOf rdf:parseType="Collection">
403   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#byte"/>
404   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#decimal"/>
405   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
  357 + <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#float"/>
406 358 <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#integer"/>
407   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#long"/>
408   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#negativeInteger"/>
409   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
410   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonPositiveInteger"/>
411   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#positiveInteger"/>
412   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#short"/>
413   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedByte"/>
414   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedInt"/>
415   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedLong"/>
416   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedShort"/>
417   - <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#rational"/>
418   - <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#real"/>
419 359 </unionOf>
420 360 </rdfs:Datatype>
421 361 </rdfs:range>
422 362 <rdfs:comment>This Data Property specifies the upper bounds for numeric values (the value must be less than this value) allowed for the SimpleTypeVariable.
423 363 It applies to:
424   -- owl:real
425   -- owl:rational
426   -- xsd:decimal
427   -- xsd:integer
428   -- xsd:nonNegativeInteger
429   -- xsd:nonPositiveInteger
430   -- xsd:positiveInteger
431   -- xsd:negativeInteger
432   -- xsd:long
433   -- xsd:int
434   -- xsd:short
435   -- xsd:byte
436   -- xsd:unsignedLong
437   -- xsd:unsignedInt
438   -- xsd:unsignedShort
439   -- xsd:unsignedByte
440   -- xsd:dateTime
441   -- xsd:dateTimeStamp</rdfs:comment>
  364 +- xs:integer
  365 +- xs:float</rdfs:comment>
442 366 </DatatypeProperty>
443 367  
444 368  
... ... @@ -451,45 +375,15 @@ It applies to:
451 375 <rdfs:range>
452 376 <rdfs:Datatype>
453 377 <unionOf rdf:parseType="Collection">
454   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#byte"/>
455   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#decimal"/>
456   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
  378 + <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#float"/>
457 379 <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#integer"/>
458   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#long"/>
459   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#negativeInteger"/>
460   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
461   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonPositiveInteger"/>
462   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#positiveInteger"/>
463   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#short"/>
464   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedByte"/>
465   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedInt"/>
466   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedLong"/>
467   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedShort"/>
468   - <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#rational"/>
469   - <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#real"/>
470 380 </unionOf>
471 381 </rdfs:Datatype>
472 382 </rdfs:range>
473 383 <rdfs:comment>This Data Property specifies the upper bounds for numeric values (the value must be less than or equal to this value) allowed for the SimpleTypeVariable.
474 384 It applies to:
475   -- owl:real
476   -- owl:rational
477   -- xsd:decimal
478   -- xsd:integer
479   -- xsd:nonNegativeInteger
480   -- xsd:nonPositiveInteger
481   -- xsd:positiveInteger
482   -- xsd:negativeInteger
483   -- xsd:long
484   -- xsd:int
485   -- xsd:short
486   -- xsd:byte
487   -- xsd:unsignedLong
488   -- xsd:unsignedInt
489   -- xsd:unsignedShort
490   -- xsd:unsignedByte
491   -- xsd:dateTime
492   -- xsd:dateTimeStamp</rdfs:comment>
  385 +- xs:integer
  386 +- xs:float</rdfs:comment>
493 387 </DatatypeProperty>
494 388  
495 389  
... ... @@ -499,20 +393,10 @@ It applies to:
499 393 <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_maxLength">
500 394 <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
501 395 <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
502   - <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#long"/>
  396 + <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
503 397 <rdfs:comment>This Data Property specifies the maximum number of characters or list items allowed of the SimpleTypeVariable. Must be equal to or greater than zero.
504 398 it applies to:
505   -- rdf:PlainLiteral
506   -- xsd:string
507   -- xsd:normalizedString
508   -- xsd:token
509   -- xsd:language
510   -- xsd:Name
511   -- xsd:NCName
512   -- xsd:NMTOKEN
513   -- xsd:anyURI
514   -- xsd:hexBinary
515   -- xsd:base64Binary</rdfs:comment>
  399 +- xs:string</rdfs:comment>
516 400 </DatatypeProperty>
517 401  
518 402  
... ... @@ -525,45 +409,15 @@ it applies to:
525 409 <rdfs:range>
526 410 <rdfs:Datatype>
527 411 <unionOf rdf:parseType="Collection">
528   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#byte"/>
529   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#decimal"/>
530   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
  412 + <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#float"/>
531 413 <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#integer"/>
532   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#long"/>
533   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#negativeInteger"/>
534   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
535   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonPositiveInteger"/>
536   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#positiveInteger"/>
537   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#short"/>
538   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedByte"/>
539   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedInt"/>
540   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedLong"/>
541   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedShort"/>
542   - <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#rational"/>
543   - <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#real"/>
544 414 </unionOf>
545 415 </rdfs:Datatype>
546 416 </rdfs:range>
547 417 <rdfs:comment>This Data Property specifies the lower bounds for numeric values (the value must be greater than this value) allowed for the SimpleTypeVariable.
548 418 It applies to:
549   -- owl:real
550   -- owl:rational
551   -- xsd:decimal
552   -- xsd:integer
553   -- xsd:nonNegativeInteger
554   -- xsd:nonPositiveInteger
555   -- xsd:positiveInteger
556   -- xsd:negativeInteger
557   -- xsd:long
558   -- xsd:int
559   -- xsd:short
560   -- xsd:byte
561   -- xsd:unsignedLong
562   -- xsd:unsignedInt
563   -- xsd:unsignedShort
564   -- xsd:unsignedByte
565   -- xsd:dateTime
566   -- xsd:dateTimeStamp</rdfs:comment>
  419 +- xs:integer
  420 +- xs:float</rdfs:comment>
567 421 </DatatypeProperty>
568 422  
569 423  
... ... @@ -576,45 +430,15 @@ It applies to:
576 430 <rdfs:range>
577 431 <rdfs:Datatype>
578 432 <unionOf rdf:parseType="Collection">
579   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#byte"/>
580   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#decimal"/>
581   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
  433 + <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#float"/>
582 434 <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#integer"/>
583   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#long"/>
584   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#negativeInteger"/>
585   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
586   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonPositiveInteger"/>
587   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#positiveInteger"/>
588   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#short"/>
589   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedByte"/>
590   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedInt"/>
591   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedLong"/>
592   - <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedShort"/>
593   - <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#rational"/>
594   - <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#real"/>
595 435 </unionOf>
596 436 </rdfs:Datatype>
597 437 </rdfs:range>
598 438 <rdfs:comment>This Data Property specifies the lower bounds for numeric values (the value must be greater than or equal to this value) allowed for the SimpleTypeVariable.
599 439 It applies to:
600   -- owl:real
601   -- owl:rational
602   -- xsd:decimal
603   -- xsd:integer
604   -- xsd:nonNegativeInteger
605   -- xsd:nonPositiveInteger
606   -- xsd:positiveInteger
607   -- xsd:negativeInteger
608   -- xsd:long
609   -- xsd:int
610   -- xsd:short
611   -- xsd:byte
612   -- xsd:unsignedLong
613   -- xsd:unsignedInt
614   -- xsd:unsignedShort
615   -- xsd:unsignedByte
616   -- xsd:dateTime
617   -- xsd:dateTimeStamp</rdfs:comment>
  440 +- xs:integer
  441 +- xs:float</rdfs:comment>
618 442 </DatatypeProperty>
619 443  
620 444  
... ... @@ -624,20 +448,10 @@ It applies to:
624 448 <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_minLength">
625 449 <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
626 450 <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
627   - <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#long"/>
  451 + <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
628 452 <rdfs:comment>This Data Property specifies the minimum number of characters or list items allowed of the SimpleTypeVariable. Must be equal to or greater than zero.
629 453 it applies to:
630   -- rdf:PlainLiteral
631   -- xsd:string
632   -- xsd:normalizedString
633   -- xsd:token
634   -- xsd:language
635   -- xsd:Name
636   -- xsd:NCName
637   -- xsd:NMTOKEN
638   -- xsd:anyURI
639   -- xsd:hexBinary
640   -- xsd:base64Binary</rdfs:comment>
  454 +- xs:string</rdfs:comment>
641 455 </DatatypeProperty>
642 456  
643 457  
... ... @@ -650,15 +464,7 @@ it applies to:
650 464 <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
651 465 <rdfs:comment>This Data Property specifies the restrictions of the SimpleTypeVariable to a subset of strings containing the exact sequence of characters that are acceptable
652 466 it applies to:
653   -- rdf:PlainLiteral
654   -- xsd:string
655   -- xsd:normalizedString
656   -- xsd:token
657   -- xsd:language
658   -- xsd:Name
659   -- xsd:NCName
660   -- xsd:NMTOKEN
661   -- xsd:anyURI</rdfs:comment>
  467 +- xs:string</rdfs:comment>
662 468 </DatatypeProperty>
663 469  
664 470  
... ... @@ -672,146 +478,92 @@ it applies to:
672 478 <oneOf>
673 479 <rdf:Description>
674 480 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
675   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">owl:rational </rdf:first>
  481 + <rdf:first>xs:NCName</rdf:first>
676 482 <rdf:rest>
677 483 <rdf:Description>
678 484 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
679   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">owl:real </rdf:first>
  485 + <rdf:first>xs:anySimpleType</rdf:first>
680 486 <rdf:rest>
681 487 <rdf:Description>
682 488 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
683   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">rdf:PlainLiteral</rdf:first>
  489 + <rdf:first>xs:anyType</rdf:first>
684 490 <rdf:rest>
685 491 <rdf:Description>
686 492 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
687   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">rdf:XMLLiteral</rdf:first>
  493 + <rdf:first>xs:anyURI</rdf:first>
688 494 <rdf:rest>
689 495 <rdf:Description>
690 496 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
691   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:NCName </rdf:first>
  497 + <rdf:first>xs:base64Binary</rdf:first>
692 498 <rdf:rest>
693 499 <rdf:Description>
694 500 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
695   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:NMTOKEN </rdf:first>
  501 + <rdf:first>xs:boolean</rdf:first>
696 502 <rdf:rest>
697 503 <rdf:Description>
698 504 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
699   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:Name </rdf:first>
  505 + <rdf:first>xs:dateTime</rdf:first>
700 506 <rdf:rest>
701 507 <rdf:Description>
702 508 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
703   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:anyURI</rdf:first>
  509 + <rdf:first>xs:decimal</rdf:first>
704 510 <rdf:rest>
705 511 <rdf:Description>
706 512 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
707   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:base64Binary </rdf:first>
  513 + <rdf:first>xs:double</rdf:first>
708 514 <rdf:rest>
709 515 <rdf:Description>
710 516 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
711   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:boolean</rdf:first>
  517 + <rdf:first>xs:duration</rdf:first>
712 518 <rdf:rest>
713 519 <rdf:Description>
714 520 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
715   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:byte </rdf:first>
  521 + <rdf:first>xs:float</rdf:first>
716 522 <rdf:rest>
717 523 <rdf:Description>
718 524 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
719   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:dateTime </rdf:first>
  525 + <rdf:first>xs:hexBinary</rdf:first>
720 526 <rdf:rest>
721 527 <rdf:Description>
722 528 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
723   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:dateTimeStamp </rdf:first>
  529 + <rdf:first>xs:integer</rdf:first>
724 530 <rdf:rest>
725 531 <rdf:Description>
726 532 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
727   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:decimal </rdf:first>
  533 + <rdf:first>xs:language</rdf:first>
728 534 <rdf:rest>
729 535 <rdf:Description>
730 536 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
731   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:hexBinary </rdf:first>
  537 + <rdf:first>xs:nonNegativeInteger</rdf:first>
732 538 <rdf:rest>
733 539 <rdf:Description>
734 540 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
735   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:int </rdf:first>
  541 + <rdf:first>xs:normalizedString</rdf:first>
736 542 <rdf:rest>
737 543 <rdf:Description>
738 544 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
739   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:integer </rdf:first>
  545 + <rdf:first>xs:positiveInteger</rdf:first>
740 546 <rdf:rest>
741 547 <rdf:Description>
742 548 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
743   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:language </rdf:first>
  549 + <rdf:first>xs:string</rdf:first>
744 550 <rdf:rest>
745 551 <rdf:Description>
746 552 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
747   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:long </rdf:first>
  553 + <rdf:first>xs:token</rdf:first>
748 554 <rdf:rest>
749 555 <rdf:Description>
750 556 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
751   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:negativeInteger </rdf:first>
  557 + <rdf:first>xs:unsignedInt</rdf:first>
752 558 <rdf:rest>
753 559 <rdf:Description>
754 560 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
755   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:nonNegativeInteger </rdf:first>
  561 + <rdf:first>xs:unsignedLong</rdf:first>
756 562 <rdf:rest>
757 563 <rdf:Description>
758 564 <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
759   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:nonPositiveInteger </rdf:first>
760   - <rdf:rest>
761   - <rdf:Description>
762   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
763   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:normalizedString </rdf:first>
764   - <rdf:rest>
765   - <rdf:Description>
766   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
767   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:positiveInteger </rdf:first>
768   - <rdf:rest>
769   - <rdf:Description>
770   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
771   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:short </rdf:first>
772   - <rdf:rest>
773   - <rdf:Description>
774   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
775   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:string </rdf:first>
776   - <rdf:rest>
777   - <rdf:Description>
778   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
779   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:token </rdf:first>
780   - <rdf:rest>
781   - <rdf:Description>
782   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
783   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:unsignedByte </rdf:first>
784   - <rdf:rest>
785   - <rdf:Description>
786   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
787   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:unsignedInt </rdf:first>
788   - <rdf:rest>
789   - <rdf:Description>
790   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
791   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:unsignedLong </rdf:first>
792   - <rdf:rest>
793   - <rdf:Description>
794   - <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
795   - <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:unsignedShort </rdf:first>
796   - <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
797   - </rdf:Description>
798   - </rdf:rest>
799   - </rdf:Description>
800   - </rdf:rest>
801   - </rdf:Description>
802   - </rdf:rest>
803   - </rdf:Description>
804   - </rdf:rest>
805   - </rdf:Description>
806   - </rdf:rest>
807   - </rdf:Description>
808   - </rdf:rest>
809   - </rdf:Description>
810   - </rdf:rest>
811   - </rdf:Description>
812   - </rdf:rest>
813   - </rdf:Description>
814   - </rdf:rest>
  565 + <rdf:first>xs:unsignedShort</rdf:first>
  566 + <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
815 567 </rdf:Description>
816 568 </rdf:rest>
817 569 </rdf:Description>
... ... @@ -886,6 +638,15 @@ E.g. a certain type of Device could have the model (as a numeric description) or
886 638  
887 639  
888 640  
  641 + <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#isDataList -->
  642 +
  643 + <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#isDataList">
  644 + <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
  645 + <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
  646 + </DatatypeProperty>
  647 +
  648 +
  649 +
889 650 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#netTechnologyCommunicationProtocol -->
890 651  
891 652 <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#netTechnologyCommunicationProtocol">
... ... @@ -1146,28 +907,10 @@ E.g. the indoor temperature could have meta data: &amp;quot;Degrees Celsius&amp;quot;&lt;/r
1146 907 </rdfs:subClassOf>
1147 908 <rdfs:subClassOf>
1148 909 <Restriction>
1149   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasInputDataPoint"/>
1150   - <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#InputDataPoint"/>
1151   - </Restriction>
1152   - </rdfs:subClassOf>
1153   - <rdfs:subClassOf>
1154   - <Restriction>
1155   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOperationState"/>
1156   - <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationState"/>
1157   - </Restriction>
1158   - </rdfs:subClassOf>
1159   - <rdfs:subClassOf>
1160   - <Restriction>
1161 910 <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutput"/>
1162 911 <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationOutput"/>
1163 912 </Restriction>
1164 913 </rdfs:subClassOf>
1165   - <rdfs:subClassOf>
1166   - <Restriction>
1167   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutputDataPoint"/>
1168   - <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint"/>
1169   - </Restriction>
1170   - </rdfs:subClassOf>
1171 914 <rdfs:comment>An Operation (Class: Operation) is the means of a Service to communicate in a procedure-type manner over the network (i.e. transmit data to/from other devices). It is the –machine interpretable- exposure of a –human understandable- Command to a network.
1172 915 An Operation is transient. I.e. an Operation can be invoked, possibly produces output and is finished.
1173 916 - A non-oneM2M Device or a oneM2M entity (e.g. an AE) can invoke an Operation of the Device (oneM2M Device or InterworkedDevice) and that invocation can trigger some action in the Device. If an Operation has input data it may receive input data from
... ... @@ -1200,52 +943,6 @@ An Operation correlates the output data of the Operation to the input data that
1200 943  
1201 944  
1202 945  
1203   - <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationState -->
1204   -
1205   - <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationState">
1206   - <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
1207   - <rdfs:subClassOf>
1208   - <Class>
1209   - <unionOf rdf:parseType="Collection">
1210   - <Restriction>
1211   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
1212   - <hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#string">data_received_by_application</hasValue>
1213   - </Restriction>
1214   - <Restriction>
1215   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
1216   - <hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#string">data_transmitted_to_interworked_device</hasValue>
1217   - </Restriction>
1218   - <Restriction>
1219   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
1220   - <hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#string">operation_ended</hasValue>
1221   - </Restriction>
1222   - <Restriction>
1223   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
1224   - <hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#string">operation_failed</hasValue>
1225   - </Restriction>
1226   - </unionOf>
1227   - </Class>
1228   - </rdfs:subClassOf>
1229   - <rdfs:subClassOf>
1230   - <Restriction>
1231   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
1232   - <qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</qualifiedCardinality>
1233   - <onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
1234   - </Restriction>
1235   - </rdfs:subClassOf>
1236   - <rdfs:subClassOf>
1237   - <Restriction>
1238   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataType"/>
1239   - <qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</qualifiedCardinality>
1240   - <onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
1241   - </Restriction>
1242   - </rdfs:subClassOf>
1243   - <rdfs:comment>describes the current state during the lifetime of an Operation. The OperationState class represents all possible values for that state (enumerated individuals). The OperationState is set during the progress of the operation by the entity invoking the operation, the entity that is the target of the operation, e.g. a device (or for interworked devices by the IPE) and the CSE. It takes values like
1244   -&quot;data_received_by_application&quot;, &quot;operation_ended&quot;, &quot;operation_failed&quot;, &quot;data_transmitted_to_interworked_device&quot;.</rdfs:comment>
1245   - </Class>
1246   -
1247   -
1248   -
1249 946 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint -->
1250 947  
1251 948 <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint">
... ... @@ -1325,9 +1022,26 @@ NOTE: While a Functionality describes the – human understandable – meaning
1325 1022 <onDataRange rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#PlainLiteral"/>
1326 1023 </Restriction>
1327 1024 </rdfs:subClassOf>
1328   - <rdfs:comment>SimpleTypeVariable (Class: SimpleTypeVariable) is a sub-class of class:Variable that only consists of Variables of simple xml types like xsd:integer, xsd:string…, potentially including restrictions
  1025 + <disjointWith rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable"/>
  1026 + <rdfs:comment>SimpleTypeVariable (Class: SimpleTypeVariable) is a sub-class of class:Variable that only consists of Variables of simple xml types like xsd:integer, xsd:string…, potentially including lists and restrictions
  1027 +
  1028 +The simple datatypes and –restrictions contained in &apos;https://www.w3.org/TR/xmlschema11-2&apos; shall be referred to using the prefix: xs</rdfs:comment>
  1029 + </Class>
  1030 +
1329 1031  
1330   -The simple datatypes and –restrictions contained in &quot;OWL 2 Web Ontology Language Structural Specification and Functional-Style Syntax (Second Edition)&quot; are supported. (see http://www.w3.org/TR/owl2-syntax/)</rdfs:comment>
  1032 +
  1033 + <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable -->
  1034 +
  1035 + <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable">
  1036 + <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
  1037 + <rdfs:subClassOf>
  1038 + <Restriction>
  1039 + <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubStructure"/>
  1040 + <minQualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</minQualifiedCardinality>
  1041 + <onClass rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
  1042 + </Restriction>
  1043 + </rdfs:subClassOf>
  1044 + <rdfs:comment>Structured type variables are variables that are not SimpleType Variables</rdfs:comment>
1331 1045 </Class>
1332 1046  
1333 1047  
... ... @@ -1366,6 +1080,10 @@ A ThingProperty of a Thing can have meta data&lt;/rdfs:comment&gt;
1366 1080 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable -->
1367 1081  
1368 1082 <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable">
  1083 + <disjointUnionOf rdf:parseType="Collection">
  1084 + <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
  1085 + <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable"/>
  1086 + </disjointUnionOf>
1369 1087 <rdfs:comment>A Variable (Class: Variable) constitutes a super class to the following classes: ThingProperty, OperationInput, OperationOutput, OperationState, InputDataPoint, OutputDataPoint, SimpleTypeVariable. Its members are entities that store some data (e.g. integers, text, or structured data) that can change over time.
1370 1088 These data of the Variable usually describe some real-world Aspects (e.g. a temperature) and can have MetaData (e.g. units, precision..)</rdfs:comment>
1371 1089 </Class>
... ...