orcid_client 0.2.3 → 0.3

data/resources/{record_2.0_rc3/education-2.0_rc3.xsd → record_2.0/education-2.0.xsd}

@@ -34,7 +34,7 @@
 	</xs:annotation>
 
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 
 	<xs:element name="education">
 		<xs:annotation>
@@ -56,9 +56,9 @@
 			<xs:complexContent>
 				<xs:extension base="common:element-summary">
 					<xs:sequence>
-						<xs:element name="department-name" type="common:non-empty-string"
+						<xs:element name="department-name" type="common:long-text"
 							minOccurs="0" maxOccurs="1" />
-						<xs:element name="role-title" type="common:non-empty-string"
+						<xs:element name="role-title" type="common:long-text"
 							minOccurs="0" maxOccurs="1" />
 						<xs:element ref="common:start-date" minOccurs="0"
 							maxOccurs="1" />
@@ -77,9 +77,9 @@
 			<xs:complexContent>
 				<xs:extension base="common:element-summary">
 					<xs:sequence>
-						<xs:element name="department-name" type="common:non-empty-string"
+						<xs:element name="department-name" type="common:long-text"
 							minOccurs="0" maxOccurs="1" />
-						<xs:element name="role-title" type="common:non-empty-string"
+						<xs:element name="role-title" type="common:long-text"
 							minOccurs="0" maxOccurs="1" />
 						<xs:element ref="common:start-date" minOccurs="0"
 							maxOccurs="1" />

data/resources/{record_2.0_rc3/email-2.0_rc3.xsd → record_2.0/email-2.0.xsd}

@@ -32,7 +32,7 @@
 		</xs:appinfo>
 	</xs:annotation>
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 	<xs:element name="emails">
 		<xs:complexType>
 			<xs:annotation>
@@ -68,6 +68,8 @@
 				<xs:sequence>
 					<xs:element name="email" type="common:email" />					
 				</xs:sequence>
+				<xs:attribute name="verified" type="xs:boolean" />
+				<xs:attribute name="primary" type="xs:boolean" />
 			</xs:extension>
 		</xs:complexContent>
 	</xs:complexType>

data/resources/{record_2.0_rc3/employment-2.0_rc3.xsd → record_2.0/employment-2.0.xsd}

@@ -34,7 +34,7 @@
 	</xs:annotation>
 
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 
 	<xs:element name="employment">
 		<xs:annotation>
@@ -56,9 +56,9 @@
 			<xs:complexContent>
 				<xs:extension base="common:element-summary">
 					<xs:sequence>
-						<xs:element name="department-name" type="common:non-empty-string"
+						<xs:element name="department-name" type="common:long-text"
 							minOccurs="0" maxOccurs="1" />
-						<xs:element name="role-title" type="common:non-empty-string"
+						<xs:element name="role-title" type="common:long-text"
 							minOccurs="0" maxOccurs="1" />
 						<xs:element ref="common:start-date" minOccurs="0"
 							maxOccurs="1" />
@@ -77,9 +77,9 @@
 			<xs:complexContent>
 				<xs:extension base="common:element-summary">
 					<xs:sequence>
-						<xs:element name="department-name" type="common:non-empty-string"
+						<xs:element name="department-name" type="common:long-text"
 							minOccurs="0" maxOccurs="1" />
-						<xs:element name="role-title" type="common:non-empty-string"
+						<xs:element name="role-title" type="common:long-text"
 							minOccurs="0" maxOccurs="1" />
 						<xs:element ref="common:start-date" minOccurs="0"
 							maxOccurs="1" />

data/resources/{record_2.0_rc3/funding-2.0_rc3.xsd → record_2.0/funding-2.0.xsd}

@@ -34,7 +34,7 @@
 	</xs:annotation>
 
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 
 	<xs:element name="funding">
 		<xs:annotation>
@@ -93,7 +93,7 @@
 		</xs:complexType>
 	</xs:element>
 
-	<xs:element name="summary">
+	<xs:element name="funding-summary">
 		<xs:complexType>
 			<xs:complexContent>
 				<xs:extension base="common:element-summary">
@@ -116,6 +116,8 @@
 								<xs:documentation>End date for the funding.</xs:documentation>
 							</xs:annotation>
 						</xs:element>
+						<xs:element name="organization" type="common:organization" 
+							minOccurs="1" maxOccurs="1" />
 					</xs:sequence>
 				</xs:extension>
 			</xs:complexContent>
@@ -152,53 +154,7 @@
 			<xs:enumeration value="salary-award" />
 		</xs:restriction>
 	</xs:simpleType>
-<!--
-	<xs:complexType name="external-identifiers">
-		<xs:annotation>
-			<xs:documentation>Container for storing the external references to
-				the funding.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element maxOccurs="unbounded" minOccurs="0"
-				name="externalIdentifier" type="funding:external-identifier" />
-		</xs:sequence>
-	</xs:complexType>
- 
-	<xs:complexType name="external-identifier">
-		<xs:annotation>
-			<xs:documentation>An external identifier that uniquely represents the
-				funding. Includes an identifier type and value as well as a URL for
-				a link to more information about the funding.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:complexContent>
-			<xs:extension base="common:external-identifier">
-				<xs:sequence>
-					<xs:element name="external-identifier-type" type="funding:external-identifier-type"
-						minOccurs="1" maxOccurs="1" />
-					<xs:element name="external-identifier-value" type="common:string-2084"
-						minOccurs="0" maxOccurs="1">
-						<xs:annotation>
-							<xs:documentation>Value of the external identifier.</xs:documentation>
-						</xs:annotation>
-					</xs:element>			
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>		
-	</xs:complexType>
-
-	<xs:simpleType name="external-identifier-type">
-		<xs:annotation>
-			<xs:documentation>The type of the funding external identifier.
-				Currently only grant number is supported.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="grant_number" />
-		</xs:restriction>
-	</xs:simpleType>
- -->
+	
 	<xs:complexType name="contributors">
 		<xs:annotation>
 			<xs:documentation>Container for the contributors of a funding.

data/resources/{record_2.0_rc3/history-2.0_rc3.xsd → record_2.0/history-2.0.xsd}

@@ -34,7 +34,7 @@
 	</xs:annotation>
 	
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 	
 	<xs:element name="history">
 		<xs:complexType>

data/resources/{record_2.0_rc3/keyword-2.0_rc3.xsd → record_2.0/keyword-2.0.xsd}

@@ -33,7 +33,7 @@
 	</xs:annotation>
 
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 
 	<xs:element name="keywords">
 		<xs:complexType>
@@ -64,7 +64,7 @@
 		<xs:complexContent>
 			<xs:extension base="common:element-summary">
 				<xs:sequence>
-					<xs:element minOccurs="1" name="content" type="common:non-empty-string" />				
+					<xs:element minOccurs="1" name="content" type="common:string-255" />				
 				</xs:sequence>			
 				</xs:extension>
 		</xs:complexContent>

data/resources/{record_2.0_rc3/other-name-2.0_rc3.xsd → record_2.0/other-name-2.0.xsd}

@@ -32,7 +32,7 @@
 		</xs:appinfo>
 	</xs:annotation>
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 
 	<xs:element name="other-names">
 		<xs:complexType>
@@ -75,7 +75,7 @@
 		<xs:complexContent>
 			<xs:extension base="common:element-summary">
 				<xs:sequence>
-					<xs:element minOccurs="1" name="content" type="common:non-empty-string">
+					<xs:element minOccurs="1" name="content" type="common:string-255">
 						<xs:annotation>
 							<xs:documentation>A short display name describing the URL.
 							</xs:documentation>

data/resources/{record_2.0_rc3/peer-review-2.0_rc3.xsd → record_2.0/peer-review-2.0.xsd}

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sch="http://purl.oclc.org/dsdl/schematron" elementFormDefault="qualified"
 	targetNamespace="http://www.orcid.org/ns/peer-review" 
@@ -37,9 +37,9 @@
 	</xs:annotation>
 
     <xs:import namespace="http://www.orcid.org/ns/common"
-        schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />	
+        schemaLocation="../common_2.0/common-2.0.xsd" />	
 	<xs:import namespace="http://www.orcid.org/ns/work"
-		schemaLocation="work-2.0_rc3.xsd" />
+		schemaLocation="work-2.0.xsd" />
 
 	<xs:element name="peer-review">
 		<xs:complexType>
@@ -135,7 +135,7 @@
 		</xs:complexType>
 	</xs:element>
 
-	<xs:element name="summary">
+	<xs:element name="peer-review-summary">
 		<xs:complexType>
 			<xs:complexContent>
 				<xs:extension base="common:element-summary">

data/resources/record_2.0/peer-review-guide-v2.0.md

@@ -0,0 +1,131 @@
+
+#ORCID API v2.0 Peer Review Guide
+Starting in v2.0, the ORCID API now supports a new activity type: ```peer-review```. 
+
+The ```peer-review``` activity type is intended to allow for recognition of and exchange of data about peer review service contributed by researchers. 
+
+The ```peer-review``` activity type follows the [CASRAI Peer Review Services data profile](http://dictionary.casrai.org/Peer_Review_Services), which was developed by the [Peer Review Services Working Group (PRS-WG)](http://casrai.org/standards/subject-groups/peer-review-services), led by [ORCID](http://orcid.org) and [F1000](http://f1000.com/). More details about ORCID's implementation of this recommendation, and the Early Adopter program for Peer Review can be found on the [Peer Review Early Adopter page](http://orcid.org/content/peer-review-early-adopter-program).
+
+##Peer Review XML
+XML for the ```peer-review``` activity follows the [peer-review-2.0.xsd](https://github.com/ORCID/ORCID-Source/blob/master/orcid-model/src/main/resources/record_2.0/peer-review-2.0.xsd) and consists of the following sections:
+
+###The fields
+
+**DESCRIBING THE REVIEWER**
+
+- **reviewer-role** _(required)_ The role played by a person in their contribution to a review. This field is selected from a list containing the following values: _chair, editor, member, organizer, reviewer_
+
+**DESCRIBING THE REVIEW**
+
+- **review-identifiers** _(required)_ Unique identifier(s) of the review. *This identifier refers to the review itself, NOT to the item that was reviewed.* At least one identifier is required. In the case where there is no persistent unique identifier for the review, the source providing the data should generate a locally-sourced unique identifier for the review (e.g., type "organization-defined-type"). This field will be checked when adding new reviews to prevent double counting of review activity.
+
+- **review-url** _(optional)_ A link to a representation of the review on the web. *This URL refers to the review itself, NOT to the item that was reviewed.*
+
+- **review-type** _(required)_ The kind of review applied to the subject type reviewed. This field is selected from a list containing the following values: _evaluation, review_
+
+
+- **review-completion-date** _(required)_ The date on which the review was completed (formatted to ISO 8601). Allowable values: yyyy; yyyy-mm; yyyy-mm-dd, formatted using the ORCID fuzzy date format. 
+
+- **review-group-id** _(required)_ Identifier for the group that this review should be a part of for aggregation purposes. The Group ID must be pre-registered before use. (see [Group ID Registration]() below for more information.) 
+
+**DESCRIBING THE SUBJECT OF THE REVIEW**
+
+- **subject-external-identifier** _(optional)_ The unique ID of the object that was reviewed. *This identifier refers to the SUBJECT of the review, not of the review itself.*
+
+- **subject-container-name** _(optional)_ The name of the journal, conference, grant review panel, or other applicable object of which the review subject was a part.
+
+- **subject-type** _(optional)_ The type of object that the review subject is (for example, a journal article, grant, etc)
+
+- **subject-name** _(optional)_ The name/title of the subject object that was reviewed.
+
+- **subject-url** _(optional)_ The URL of the subject object that was reviewed. *This URL points to the SUBJECT of the review, not to the review itself.*
+
+**DESCRIBING THE ORGANIZATION THAT THE REVIEW WAS DONE FOR**
+
+- **convening-organization** _(required)_ Information about the organization convening the review (journal publisher, conference organizer, funding agency, etc.). Whenever possible, this organization is identified by a unique identifier like the Ringgold ID or FundRef ID.
+
+###Example file
+
+For an example XML file, see [peer-review-2.0.xml](https://github.com/ORCID/ORCID-Source/blob/master/orcid-model/src/main/resources/record_2.0/samples/peer-review-2.0.xml )
+
+***Note:*** *Sample files contain system-generated elements/attributes that are returned when reading items from ORCID. The following items should not be included when posting items to ORCID:*
+
+- *put-code (exception: include put-code when updating items using the PUT method)*
+- *source*
+- *created-date*
+- *last-modified-date*
+
+
+##Peer Review API Reference
+```peer-review``` is available only in ORCID API v2.0_rcX, which uses a slightly different data structure from previous API versions. 
+
+In v2.0_rcX, activities are read, added, and modified on an individual basis (rather than as a list), using a ```put-code```, which is a system-generated identifier used within the ORCID database.
+
+The ```put-code``` for a specific item can be obtained by reading a summary of a user's ORCID record.
+
+Other notable differences between v2.0_rcX previous versions include:
+
+- Only 2 scopes are used: ```/read-limited``` and ```/activities/update```
+- An explicit ```DELETE``` method is used to remove record items
+
+###Read Activities Summary
+| Action                   | HTTP method | Scope                    | URL                                                      |
+|-------------------------|-------------|--------------------------|----------------------------------------------------------|
+| Read activities summary | GET         | /read-limited | https://api.sandbox.orcid.org/v2.0/[ORCID-iD]/activities |
+
+###Read/Modifiy Peer Review Activities
+| Action             | HTTP method | Scope                    | URL                                                                      |
+|--------------------|-------------|--------------------------|--------------------------------------------------------------------------|
+| Add peer-review item    | POST        | /activities/update       | https://api.sandbox.orcid.org/v2.0/[ORCID-iD]/peer-review            |
+| Read peer-review item   | GET         | /read-limited | https://api.sandbox.orcid.org/v2.0/[ORCID-iD]/peer-review/[PUT-CODE] |
+| Update peer-review item | PUT         | /activities/update       | https://api.sandbox.orcid.org/v2.0/[ORCID-iD]/peer-review/[PUT-CODE] |
+| Delete peer-review item | DELETE      | /activities/update       | https://api.sandbox.orcid.org/v2.0/[ORCID-iD]/peer-review/[PUT-CODE] |
+
+
+- **[ORCID-iD]** is the ORCID iD for the record, formatted as XXXX-XXXX-XXXX-XXXX
+- **[PUT-CODE]** is the ```put-code``` attribute for the specific ```peer-review``` activity that you wish to read or modify.
+
+###Example cURL Statements
+####Read Activities Summary
+
+```shell
+curl -i -H "Accept: application/orcid+xml" \
+	-H 'Authorization: Bearer dd91868d-d29a-475e-9acb-bd3fdf2f43f4' \
+	'https://api.sandbox.orcid.org/v2.0/0000-0002-1306-4180/activities'
+```
+
+####Add Peer-Review Activity
+
+```shell
+curl -i -H 'Content-type: application/orcid+xml’ \
+	-H 'Authorization: Bearer dd91868d-d29a-475e-9acb-bd3fdf2f43f4' \
+	-d '@[FILE-PATH]/peer-review-item.xml' \
+	-X POST 'https://api.sandbox.orcid.org/v2.0/[ORCID]/peer-review'
+```
+
+####Read Peer-Review Activity
+
+```
+curl -i -H "Accept: application/orcid+xml" \
+	-H 'Authorization: Bearer dd91868d-d29a-475e-9acb-bd3fdf2f43f4' \
+	'https://api.sandbox.orcid.org/v2.0/[ORCID]/peer-review/[PUT-CODE]'
+```
+
+####Update Peer-Review Activity
+
+```shell
+curl -i -H 'Content-type: application/orcid+xml’ \
+	-H 'Authorization: Bearer dd91868d-d29a-475e-9acb-bd3fdf2f43f4' \
+	-d '@[FILE-PATH]/peer-review-item-updated.xml' \
+	-X PUT 'https://api.sandbox.orcid.org/v2.0/[ORCID]/peer-review/[PUT-CODE]'
+```
+
+####Delete Peer-Review Activity
+
+```shell
+curl -i -H 'Content-type: application/orcid+xml’ \
+	-H 'Authorization: Bearer dd91868d-d29a-475e-9acb-bd3fdf2f43f4' \
+	-X DELETE 'https://api.sandbox.orcid.org/v2.0/[ORCID]/peer-review/[PUT-CODE]'
+```
+
+

data/resources/{record_2.0_rc3/person-2.0_rc3.xsd → record_2.0/person-2.0.xsd}

@@ -37,21 +37,21 @@
 	</xs:annotation>
 
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/personal-details"
-		schemaLocation="../record_2.0_rc3/personal-details-2.0_rc3.xsd" />
+		schemaLocation="../record_2.0/personal-details-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/other-name"
-		schemaLocation="../record_2.0_rc3/other-name-2.0_rc3.xsd" />
+		schemaLocation="../record_2.0/other-name-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/researcher-url"
-		schemaLocation="../record_2.0_rc3/researcher-url-2.0_rc3.xsd" />
+		schemaLocation="../record_2.0/researcher-url-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/email"
-		schemaLocation="../record_2.0_rc3/email-2.0_rc3.xsd" />
+		schemaLocation="../record_2.0/email-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/address"
-		schemaLocation="../record_2.0_rc3/address-2.0_rc3.xsd" />
+		schemaLocation="../record_2.0/address-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/keyword"
-		schemaLocation="../record_2.0_rc3/keyword-2.0_rc3.xsd" />
+		schemaLocation="../record_2.0/keyword-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/external-identifier"
-		schemaLocation="../record_2.0_rc3/person-external-identifier-2.0_rc3.xsd" />
+		schemaLocation="../record_2.0/person-external-identifier-2.0.xsd" />
 
 	<xs:element name="person">
 		<xs:annotation>
@@ -82,17 +82,4 @@
 		</xs:complexType>
 	</xs:element>
 
-	<xs:complexType name="credit-name">
-		<xs:simpleContent>
-			<xs:extension base="personal-details:credit-name" />				
-		</xs:simpleContent>
-	</xs:complexType>
-
-	<xs:complexType name="scope-paths">
-		<xs:sequence>
-			<xs:element name="scope-path" type="common:scope-path-type"
-				minOccurs="1" maxOccurs="unbounded" />
-		</xs:sequence>
-	</xs:complexType>
-
 </xs:schema>

data/resources/{record_2.0_rc3/person-external-identifier-2.0_rc3.xsd → record_2.0/person-external-identifier-2.0.xsd}

@@ -33,7 +33,7 @@
 		</xs:appinfo>
 	</xs:annotation>
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 
 	<xs:element name="external-identifiers">
 		<xs:annotation>

data/resources/{record_2.0_rc3/personal-details-2.0_rc3.xsd → record_2.0/personal-details-2.0.xsd}

@@ -34,9 +34,9 @@
 	</xs:annotation>
 
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/other-name"
-		schemaLocation="../record_2.0_rc3/other-name-2.0_rc3.xsd" />
+		schemaLocation="../record_2.0/other-name-2.0.xsd" />
 
 	<xs:element name="personal-details">
 		<xs:annotation>
@@ -115,7 +115,7 @@
 				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
-						<xs:extension base="common:non-empty-string" />
+						<xs:extension base="common:string-150" />
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
@@ -128,7 +128,7 @@
 				</xs:annotation>
 				<xs:complexType>
 					<xs:simpleContent>
-						<xs:extension base="common:non-empty-string" />
+						<xs:extension base="common:string-150" />
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
@@ -178,9 +178,7 @@
 
 	<xs:complexType name="credit-name">
 		<xs:simpleContent>
-			<xs:extension base="common:non-empty-string">
-				<xs:attribute name="visibility" type="common:visibility"  use="optional"/>
-			</xs:extension>
+			<xs:extension base="common:credit-name" />
 		</xs:simpleContent>
 	</xs:complexType>
 </xs:schema>

data/resources/{record_2.0_rc3/preferences-2.0_rc3.xsd → record_2.0/preferences-2.0.xsd}

@@ -33,7 +33,7 @@
 		</xs:appinfo>
 	</xs:annotation>
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 	<xs:element name="preferences">
     <xs:complexType>
         <xs:annotation>

data/resources/{record_2.0_rc3/record-2.0_rc3.xsd → record_2.0/record-2.0.xsd}

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>   
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sch="http://purl.oclc.org/dsdl/schematron" elementFormDefault="qualified"
 	targetNamespace="http://www.orcid.org/ns/record" xmlns:internal="http://www.orcid.org/ns/internal"
 	xmlns:person="http://www.orcid.org/ns/person" xmlns:common="http://www.orcid.org/ns/common"
 	xmlns:work="http://www.orcid.org/ns/work" xmlns:funding="http://www.orcid.org/ns/funding"
 	xmlns:education="http://www.orcid.org/ns/education" xmlns:employment="http://www.orcid.org/ns/employment"
-	xmlns:deprecated="http://www.orcid.org/ns/deprecated" xmlns:activities="http://www.orcid.org/ns/activities"
-	xmlns:history="http://www.orcid.org/ns/history" xmlns:record="http://www.orcid.org/ns/record"
-	xmlns:preferences="http://www.orcid.org/ns/preferences" xmlns:peer-review="http://www.orcid.org/ns/peer-review">
+	xmlns:activities="http://www.orcid.org/ns/activities" xmlns:history="http://www.orcid.org/ns/history"
+	xmlns:record="http://www.orcid.org/ns/record" xmlns:preferences="http://www.orcid.org/ns/preferences"
+	xmlns:peer-review="http://www.orcid.org/ns/peer-review">
 	<xs:annotation>
 		<xs:documentation>
 			=============================================================================
@@ -39,29 +39,25 @@
 	</xs:annotation>
 
 	<xs:import namespace="http://www.orcid.org/ns/activities"
-		schemaLocation="activities-2.0_rc3.xsd" />
+		schemaLocation="activities-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/person"
-		schemaLocation="person-2.0_rc3.xsd" />
-    <xs:import namespace="http://www.orcid.org/ns/common"
-        schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
-	<xs:import namespace="http://www.orcid.org/ns/deprecated"
-		schemaLocation="deprecated-2.0_rc3.xsd" />
+		schemaLocation="person-2.0.xsd" />
+	<xs:import namespace="http://www.orcid.org/ns/common"
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/history"
-		schemaLocation="history-2.0_rc3.xsd" />
-	<xs:import namespace="http://www.orcid.org/ns/internal"
-		schemaLocation="internal-2.0_rc3.xsd" />
+		schemaLocation="history-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/preferences"
-		schemaLocation="preferences-2.0_rc3.xsd" />
+		schemaLocation="preferences-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/work"
-		schemaLocation="work-2.0_rc3.xsd" />
+		schemaLocation="work-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/funding"
-		schemaLocation="funding-2.0_rc3.xsd" />
+		schemaLocation="funding-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/education"
-		schemaLocation="education-2.0_rc3.xsd" />
+		schemaLocation="education-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/employment"
-		schemaLocation="employment-2.0_rc3.xsd" />		
+		schemaLocation="employment-2.0.xsd" />
 	<xs:import namespace="http://www.orcid.org/ns/peer-review"
-		schemaLocation="peer-review-2.0_rc3.xsd" />
+		schemaLocation="peer-review-2.0.xsd" />
 
 	<xs:element name="record">
 		<xs:complexType>
@@ -87,8 +83,6 @@
 			<xs:sequence>
 				<xs:element ref="common:orcid-identifier" minOccurs="0"
 					maxOccurs="1" />
-				<xs:element ref="deprecated:deprecated" minOccurs="0"
-					maxOccurs="1" />
 				<xs:element ref="preferences:preferences" minOccurs="0"
 					maxOccurs="1" />
 				<xs:element ref="history:history" minOccurs="0"
@@ -96,9 +90,8 @@
 				<xs:element ref="person:person" minOccurs="0" maxOccurs="1" />
 				<xs:element ref="activities:activities-summary"
 					minOccurs="0" maxOccurs="1" />
-				<xs:element ref="internal:internal" minOccurs="0"
-					maxOccurs="1" />
 			</xs:sequence>
+			<xs:attribute name="path" type="common:element-path" use="optional" />
 		</xs:complexType>
 	</xs:element>
 

data/resources/{record_2.0_rc3/researcher-url-2.0_rc3.xsd → record_2.0/researcher-url-2.0.xsd}

@@ -33,7 +33,7 @@
 		</xs:appinfo>
 	</xs:annotation>
 	<xs:import namespace="http://www.orcid.org/ns/common"
-		schemaLocation="../common_2.0_rc3/common-2.0_rc3.xsd" />
+		schemaLocation="../common_2.0/common-2.0.xsd" />
 	<xs:element name="researcher-urls">
 		<xs:complexType>
 			<xs:annotation>
@@ -70,7 +70,7 @@
 			<xs:extension base="common:element-summary">	
 				<xs:sequence>
 					<xs:element minOccurs="1" maxOccurs="1" name="url-name"
-						type="common:non-empty-string">
+						type="common:string-350">
 						<xs:annotation>
 							<xs:documentation>A short display name describing the URL.
 							</xs:documentation>