Misc cleanups

1. Put $schemas and $namespaces at the end of the file
2. Split long label into label & doc.
3. 'id' is not a valid s:Persion property, 'identifier' is (see
http://schema.org/Person )

Author: mr-c

_includes/cwl/metadata_example.cwl

@@ -22,6 +22,7 @@ outputs:
     format: edam:format_1964
     label: A text file that contains a line count
 
-
 $namespaces:
-    edam: http://edamontology.org/
+  edam: http://edamontology.org/
+$schemas:
+  - http://edamontology.org/EDAM_1.18.owl

_includes/cwl/metadata_example2.cwl

@@ -2,8 +2,8 @@
 cwlVersion: v1.0
 class: CommandLineTool
 
-label: An example tool demonstrating metadata. Note that this is an example and the metadata is not necessarily consistent.
-
+label: An example tool demonstrating metadata.
+doc: Note that this is an example and the metadata is not necessarily consistent.
 
 inputs:
   aligned_sequences:
@@ -23,26 +23,27 @@ outputs:
     format: edam:format_1964
     label: A text file that contains a line count
 
-$namespaces:
-  s: https://schema.org/
-  edam: http://edamontology.org/
-
-$schemas:
-- https://schema.org/docs/schema_org_rdfa.html
-
 s:author:
   - class: s:Person
-    s:id: https://orcid.org/0000-0002-6130-1021
+    s:identifier: https://orcid.org/0000-0002-6130-1021
     s:email: mailto:[email protected]
     s:name: Denis Yuen
 
 s:contributor:
   - class: s:Person
-    s:id: http://orcid.org/0000-0002-7681-6415
+    s:identifier: http://orcid.org/0000-0002-7681-6415
     s:email: mailto:[email protected]
     s:name: Brian O'Connor
 
 s:citation: https://dx.doi.org/10.6084/m9.figshare.3115156.v2
 s:codeRepository: https://github.com/common-workflow-language/common-workflow-language
 s:dateCreated: "2016-12-13"
 s:license: https://www.apache.org/licenses/LICENSE-2.0
+
+$namespaces:
+  s: https://schema.org/
+  edam: http://edamontology.org/
+
+$schemas:
+ - https://schema.org/docs/schema_org_rdfa.html
+ - http://edamontology.org/EDAM_1.18.owl

_includes/cwl/metadata_example3.cwl

@@ -2,11 +2,11 @@
 cwlVersion: v1.0
 class: CommandLineTool
 
-label: An example tool demonstrating metadata. Note that this is an example and the metadata is not necessarily consistent.
-
+label: An example tool demonstrating metadata.
+doc: Note that this is an example and the metadata is not necessarily consistent.
 
 hints:
-  - class: ResourceRequirement
+  ResourceRequirement:
     coresMin: 4
 
 inputs:
@@ -27,22 +27,15 @@ outputs:
     format: edam:format_1964
     label: A text file that contains a line count
 
-$namespaces:
-- s: https://schema.org/
-- edam: https://edamontology.org/
-
-$schemas:
-- https://schema.org/docs/schema_org_rdfa.html
-
 s:author:
   - class: s:Person
-    s:id: https://orcid.org/0000-0002-6130-1021
+    s:identifier: https://orcid.org/0000-0002-6130-1021
     s:email: mailto:[email protected]
     s:name: Denis Yuen
 
 s:contributor:
   - class: s:Person
-    s:id: http://orcid.org/0000-0002-7681-6415
+    s:identifier: http://orcid.org/0000-0002-7681-6415
     s:email: mailto:[email protected]
     s:name: Brian O'Connor
 
@@ -53,3 +46,11 @@ s:license: https://www.apache.org/licenses/LICENSE-2.0
 
 s:keywords: edam:topic_0091 , edam:topic_0622
 s:programmingLanguage: C
+
+$namespaces:
+ s: https://schema.org/
+ edam: https://edamontology.org/
+
+$schemas:
+ - https://schema.org/docs/schema_org_rdfa.html
+ - http://edamontology.org/EDAM_1.18.owl