orcid_client 0.2.3 → 0.3

data/resources/{common_2.0_rc3/common-2.0_rc3.xsd → common_2.0/common-2.0.xsd}

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<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/common" xmlns:common="http://www.orcid.org/ns/common">
 	<xs:annotation>
@@ -164,7 +164,7 @@
 		</xs:annotation>
 
 		<xs:sequence>
-			<xs:element name="name" type="common:non-empty-string" />
+			<xs:element name="name" type="common:long-text" />
 			<xs:element name="address" type="common:organization-address" />
 			<xs:element name="disambiguated-organization" type="common:disambiguated-organization"
 				minOccurs="0" maxOccurs="1" />
@@ -177,12 +177,12 @@
 			</xs:documentation>
 		</xs:annotation>
 		<xs:sequence>
-			<xs:element minOccurs="1" name="city" type="common:non-empty-string">
+			<xs:element minOccurs="1" name="city" type="common:long-text">
 				<xs:annotation>
 					<xs:documentation>City</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element minOccurs="0" name="region" type="common:non-empty-string">
+			<xs:element minOccurs="0" name="region" type="common:long-text">
 				<xs:annotation>
 					<xs:documentation>Region within a country</xs:documentation>
 				</xs:annotation>
@@ -816,7 +816,7 @@
 			</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:string">
-			<xs:pattern value="APP-[\da-zA-Z]{16}" />
+			<xs:pattern value="(APP-[\da-zA-Z]{16}|(\d{4}-){3,}\d{3}[\dX])" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -827,7 +827,7 @@
 		</xs:annotation>
 		<xs:restriction base="xs:string">
 			<xs:pattern
-				value="http://([^/]*orcid\.org|localhost.*/orcid-web)/client/APP-[\da-zA-Z]{16}" />
+				value="http://([^/]*orcid\.org|localhost.*/orcid-web)/client/(APP-[\da-zA-Z]{16}|(\d{4}-){3,}\d{3}[\dX])" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -943,6 +943,7 @@
 			</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:string">
+			<xs:maxLength value="350" />
 			<xs:pattern value="[^@]+@[^\.]+\..+" />
 		</xs:restriction>
 	</xs:simpleType>
@@ -1042,35 +1043,7 @@
 				</xs:element>
 			</xs:sequence>
 		</xs:sequence>
-	</xs:complexType>
-
-	<xs:simpleType name="scope-path-type">
-		<xs:annotation>
-			<xs:documentation>See the ORCID Knowledgebase for a complete
-				description of ORCID Scopes and related documentation:
-				http://support.orcid.org/knowledgebase/articles/120162-orcid-scopes.
-			</xs:documentation>
-		</xs:annotation>
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="/activities/update" />
-			<xs:enumeration value="/authenticate" />			
-			<xs:enumeration value="/funding/create" />
-			<xs:enumeration value="/funding/read-limited" />
-			<xs:enumeration value="/funding/update" />			
-			<xs:enumeration value="/orcid-bio/external-identifiers/create" />
-			<xs:enumeration value="/orcid-bio/read-limited" />
-			<xs:enumeration value="/orcid-bio/update" />			
-			<xs:enumeration value="/orcid-patents/update" />			
-			<xs:enumeration value="/orcid-patents/create" />			
-			<xs:enumeration value="/orcid-patents/read-limited" />
-			<xs:enumeration value="/orcid-profile/read-limited" />
-			<xs:enumeration value="/orcid-works/create" />
-			<xs:enumeration value="/orcid-works/read-limited" />
-			<xs:enumeration value="/orcid-works/update" />
-			<xs:enumeration value="/person/update" />
-			<xs:enumeration value="/read-limited" />								
-		</xs:restriction>
-	</xs:simpleType>
+	</xs:complexType>	
 
 	<xs:simpleType name="iso-3166-country">
 		<xs:annotation>
@@ -1353,7 +1326,7 @@
 
 	<xs:simpleType name="short-text">
 		<xs:annotation>
-			<xs:documentation>A non-empty string that has a maximum size of 2084
+			<xs:documentation>A non-empty string that has a maximum size of 500
 				characters
 			</xs:documentation>
 		</xs:annotation>
@@ -1362,6 +1335,28 @@
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:simpleType name="string-150">
+		<xs:annotation>
+			<xs:documentation>A non-empty string that has a maximum size of 150
+				characters
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="common:non-empty-string">
+			<xs:maxLength value="150" />	
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="string-200">
+		<xs:annotation>
+			<xs:documentation>A non-empty string that has a maximum size of 200
+				characters
+			</xs:documentation> 
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="200" />
+		</xs:restriction>
+	</xs:simpleType>
+
 	<xs:simpleType name="string-255">
 		<xs:annotation>
 			<xs:documentation>A non-empty string that has a maximum size of 255
@@ -1373,6 +1368,17 @@
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:simpleType name="string-350">
+		<xs:annotation>
+			<xs:documentation>A non-empty string that has a maximum size of 350
+				characters
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="common:non-empty-string">
+			<xs:maxLength value="350" />
+		</xs:restriction>
+	</xs:simpleType>
+
 	<xs:simpleType name="string-1000">
 		<xs:annotation>
 			<xs:documentation>A non-empty string that has a maximum size of 1000
@@ -1393,7 +1399,7 @@
 		<xs:restriction base="common:non-empty-string">
 			<xs:maxLength value="2084" />
 		</xs:restriction>
-	</xs:simpleType>
+	</xs:simpleType>	
 
 	<xs:complexType name="string-with-lang-code">
 		<xs:annotation>
@@ -1416,10 +1422,21 @@
 			</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:string">
-			<xs:maxLength value="5000"></xs:maxLength>
+			<xs:maxLength value="5000" />
 		</xs:restriction>
 	</xs:simpleType>
 
+	<xs:simpleType name="long-text">
+		<xs:annotation>
+			<xs:documentation>Must contain one or more charaters that are not a
+				space, carriage return or linefeed
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="common:non-empty-string">			
+			<xs:maxLength value="4000" />					
+		</xs:restriction>		
+	</xs:simpleType>
+
 	<xs:complexType name="credit-name">
 		<xs:annotation>
 			<xs:documentation>The name to use for the researcher or contributor
@@ -1435,9 +1452,7 @@
 			</xs:documentation>
 		</xs:annotation>
 		<xs:simpleContent>
-			<xs:extension base="common:non-empty-string">
-				<xs:attribute name="visibility" type="common:visibility" />
-			</xs:extension>
+			<xs:extension base="common:string-150" />
 		</xs:simpleContent>
 	</xs:complexType>
 
@@ -1450,13 +1465,16 @@
 		</xs:annotation>
 	</xs:element>
 
-	<xs:element name="subtitle">
-		<xs:complexType mixed="true">
-			<xs:annotation>
-				<xs:documentation>If the work has a subtitle, include it here.
-				</xs:documentation>
-			</xs:annotation>
-		</xs:complexType>
+	<xs:element name="subtitle">		
+		<xs:annotation>
+			<xs:documentation>If the work has a subtitle, include it here.
+			</xs:documentation>
+		</xs:annotation>		
+		<xs:simpleType>
+			<xs:restriction base="xs:string">
+				<xs:maxLength value="1000"/>			
+			</xs:restriction>
+		</xs:simpleType>
 	</xs:element>
 
 	<xs:element name="translated-title">
@@ -1620,5 +1638,6 @@
 		<xs:restriction base="common:string-1000">
 			<xs:pattern value="(ringgold:|issn:|orcid-generated:|fundref:|publons:)([0-9a-zA-Z\^._~:/?#\[\]@!$&amp;'()*+,;=-]){2,}" />
 		</xs:restriction>    		
-	</xs:simpleType>
+	</xs:simpleType>		
+	
 </xs:schema>

data/resources/{common_2.0_rc3/samples/common-2.0_rc3.xml → common_2.0/samples/common-2.0.xml}

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <common:application-group-orcid
     xmlns:common="http://www.orcid.org/ns/common" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.orcid.org/ns/common ../common-2.0_rc3.xsd ">
+    xsi:schemaLocation="http://www.orcid.org/ns/common ../common-2.0.xsd ">
     <common:uri>http://orcid.org/8888-8888-8888-8880</common:uri>
     <common:path>8888-8888-8888-8880</common:path>
     <common:host>orcid.org</common:host>

data/resources/notification_2.0/README.md

@@ -0,0 +1,123 @@
+
+#ORCID API v2.0_rc1 Notifications Permission Guide
+Starting in v2.0_rc1, the ORCID API supports new functionality to enable member organizations to add permission requests to a user's ORCID Inbox. These requests provide a "snapshot" example of the type of activities that will be added to the user's ORCID record as a result of granting the permission.
+
+_**User-friendly implementation detail**: Several fields described below are displayed directly to the end user. The ORCID user interface is currently available in 10+ languages, and emails sent to the user are also presented in the user's language of choice. The language preference of the user is available via the ORCID API, and is always public. We strongly recommend that you read and consider the user's language when providing messages to them, providing user-displayed fields in their preferred language when feasible._
+
+##Notifications Permission XML
+XML for the ```permission``` notifications follows the [notification-permission-2.0_rc1.xsd](https://github.com/ORCID/ORCID-Source/blob/master/orcid-model/src/main/resources/notification_2.0_rc1/notification-permission-2.0_rc1.xsd) and consists of the following sections:
+
+- **notification:notification-type**: The type of notification - for this type of notification, the value is always ```permission```. 
+
+- **notification:authorization-url**: This field is the URL string that you would call if you were asking for the permission from the user from your own application. It is formatted as a URL string, using the format found for the call [GET OAUTH/AUTHORIZE](http://members.orcid.org/api/get-oauthauthorize). _Note: one may specify only the URL path if desired. This approach is useful if you want to use identical code in multiple environments, for example on the ORCID Sandbox and Production environments._
+
+- **notification:notification-subject**: DISPLAYED TO END USER. A plain text value for describing to the user the type of items that you'll plan to add to his/her record once permission is granted. This value should be short (fewer than 25 characters), and can be a bit more descriptive, for example, "your recent publications", or "validated affiliations", or it can simply mirror the value used for ```notification:item-type``` below (education, employment, etc. You should assume that this text will be used in the middle of a sentence _(for example, the message subject line of "Add <notification:item-type> to your ORCID record")_, so you should use discretion on capitalization and length.
+
+- **notification:notification-intro**: DISPLAYED TO END USER. A short message that will be included in the inbox message to the end-user. This message will be presented before the list of activities that you have included in the message. Your intro message should not exceed 1000 characters.
+
+
+
+**notification:items block**
+
+Consists of one or more ```notification:item``` elements, which contain the following sub-elements:
+
+- **notification:item-type**: The type of ORCID item represented by this ```item``` element. Choosen from the following: ```education```, ```employment```, ```funding```, or ```work```.
+
+- **notification:item-name**: DISPLAYED TO END USER. The name that should be shown to the end user to describe the item. This field is usually the name of the item that might be added once permission is granted (for example, the title of an article), but it also could include other identifying information, for example, _"Article Title (as published in journal ABC)"_, where "(as published in journal ABC)" is additional infomration that the client application would like to present to the user.
+
+- **notification:external-identifier**: DISPLAYED TO END USER. An external identifier for the item. While this field is not required, it is very helpful information to provide to the end user, as it distinguishes the item from others that may be similar. Note that, when adding the item to the ORCID record, at least one external identifier is required, even if an internal reference identifier is used for this purpose. 
+
+For an example XML file, see [notification-permission-2.0_rc1.xml](https://github.com/ORCID/ORCID-Source/blob/master/orcid-model/src/main/resources/notification_2.0_rc1/samples/notification-permission-2.0_rc1.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. These fields will be present when reading notifications using this API:*
+
+- **put-code** - ORCID_internal identifier for this notification. _(exception: you must include the put-code when updating items using the PUT method to update an item previously added)_
+- **source** - the system will inlcude your client application as the source
+- **created-date** - date that you created this notification; automatically assigned by the system
+- **sent-date** - date that the notification was sent to the end user from the inbox _(note that usually inbox messages are sent in batch to the user at an interval that the user specifies.)_
+- **read-date** - date that the user read your notification in the ORCID Inbox, OR took action on the notification sent through the users email
+- **actioned-date** - Date the user took action on the notification _(note that some notifications will not have explicit actions, in this case, reading the notification would update both the read & actioned date)_.
+- **archived-date** - date that the user archived your notification
+
+
+##Notifications Permission Reference
+```permission``` notifications are available only in ORCID API v2.0_rcX, which uses a slightly different data structure from previous API versions. 
+
+In v2.0_rcX, items 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 notifications.
+
+Other notable differences between v2.0_rcX previous versions include:
+
+- An explicit ```DELETE``` method is used to remove record items
+
+###Request a notification access token
+
+Authorized client applications may obtain a notification access token from the ORCID server (using a 2-legged, or "client_credentials" OAuth flow) as described below. If your client is not yet authorized, please [contact support](http://orcid.org/help/contact-us) to request this feature to be turned on for your client. 
+
+_Please note that ORCID reserves the right to limit the client applications with authorization to send messages directly to ORCID iD holders using the ORCID Inbox._
+
+**Resource URL**
+
+| Environment | Resource URL |
+| ----------- | ------------ |
+|Developers Sandbox | https://api.sandbox.orcid.org/oauth/token |
+| Production Registry | https://api.orcid.org/oauth/token |
+
+**Paramaters**
+
+| Field | Value|
+| ---- | ---- |
+| client_id<br/>*required* | The client id value &lt;client-id&gt; from ORCID client application registration |
+| client_secret<br/>*required* | The client secret value &lt;client-secret&gt; from ORCID client application registration |
+| scope<br/>*required* | The authorization scope for the requested access token. Value must be ```/premium-notification``` |
+| grant_type<br/>*required* | Specifies the authorization mechanism for the granting the access token. Value for this call must be ```client_credentials``` |
+
+**Header**
+
+| Field | Value|
+| ---- | ---- |
+| Accept<br/>_required_ | The format for the call response. Must be ```Accept: application/json``` |
+
+###REST API for notifications
+| Action                   | HTTP method | Scope                    | URL                                                      |
+|-------------------------|-------------|--------------------------|----------------------------------------------------------|
+| Add a notification | POST | /premium-notification | http://api.sandbox.orcid.org/v2.0_rc1/[ORCID]/notification-permission |
+| Read a notification | GET | /premium-notification | http://api.sandbox.orcid.org/v2.0_rc1/[ORCID]/notification-permission/[PUT-CODE] |
+| Flag an unread notification as archived | DELETE | /premium-notification | http://api.sandbox.orcid.org/v2.0_rc1/[ORCID]/notification-permission/[PUT-CODE] |
+
+- **[ORCID]** is the ORCID iD for the record, formatted as XXXX-XXXX-XXXX-XXXX
+- **[PUT-CODE]** is the ```put-code``` attribute for the specific ```notification``` that you wish to read or modify.
+
+###Example cURL Statements
+####Request a notification access token
+```
+curl -i -L -H 'Accept: application/json' \
+	-d 'client_id=APP-...' \
+	-d 'client_secret=...' \
+	-d 'scope=/premium-notification' \
+	-d 'grant_type=client_credentials' \
+	'http://api.sandbox.orcid.org/oauth/token'
+```
+
+####Add a notification
+```
+curl -i -H 'Authorization: Bearer ...' \
+	-H 'Content-Type: application/orcid+xml' \
+	-X POST -d '@[FILE-PATH]/notification-permission.xml' \
+	https://api.sandbox.orcid.org/v2.0_rc1/[ORCID]/notification-permission
+```
+
+####Read a notification
+```
+curl -i -H 'Authorization: Bearer ...' \
+	-H 'Content-Type: application/orcid+xml' \
+	https://api.sandbox.orcid.org/v2.0_rc1/[ORCID]/notification-permission/[PUT-CODE]
+```
+
+####Flag an unread notification as archived
+```
+curl -i -H 'Authorization: Bearer ...' \
+	-H 'Content-Type: application/orcid+xml' \
+	-X DELETE https://api.sandbox.orcid.org/v2.0_rc1/[ORCID]/notification-permission/[PUT-CODE] 
+```

data/resources/notification_2.0/notification-custom-2.0.xsd

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+	targetNamespace="http://www.orcid.org/ns/notification" xmlns:notification="http://www.orcid.org/ns/notification"
+	xmlns:common="http://www.orcid.org/ns/common"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" vc:minVersion="1.1">
+	<xs:import namespace="http://www.orcid.org/ns/common" schemaLocation="../common_2.0/common-2.0.xsd" />
+	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../xml.xsd"/>
+	<xs:element name="notification">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="notification-type">
+			        <xs:simpleType>
+			            <xs:restriction base="xs:string">
+			                <xs:enumeration value="custom"/>
+			            </xs:restriction>
+			        </xs:simpleType>
+			    </xs:element>
+				<xs:element name="subject">
+					<xs:simpleType>
+						<xs:restriction base="xs:string">
+							<xs:maxLength value="200" />
+						</xs:restriction>
+					</xs:simpleType>
+				</xs:element>
+				<xs:element type="xs:string" name="body-text"/>
+				<xs:element type="xs:string" name="body-html"/>
+				<xs:element ref="common:created-date" minOccurs="0"/>
+				<xs:element ref="common:sent-date"/>
+				<xs:element ref="common:read-date" minOccurs="0"/>
+				<xs:element ref="common:archived-date" minOccurs="0"/>
+				<xs:element ref="common:source" minOccurs="0"/>
+			</xs:sequence>
+            <xs:attribute name="put-code" type="common:put-code" use="optional" />
+            <xs:attribute ref="xml:lang" use="optional" />
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

data/resources/notification_2.0/notification-permission-2.0.xsd

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<xs:schema attributeFormDefault="unqualified"
+	elementFormDefault="qualified" targetNamespace="http://www.orcid.org/ns/notification"
+	xmlns:notification="http://www.orcid.org/ns/notification" xmlns:common="http://www.orcid.org/ns/common"
+	xmlns:activities="http://www.orcid.org/ns/activities" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" vc:minVersion="1.1">
+	<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/activities"
+		schemaLocation="../record_2.0/activities-2.0.xsd" />
+	
+	<xs:element name="notifications">
+		<xs:annotation>
+			<xs:documentation>Notification container</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="notification" type="notification:notification"
+					minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:element name="notification">
+		<xs:annotation>
+			<xs:documentation>Notification element
+			</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:complexContent>
+				<xs:extension base="notification:notification"></xs:extension>
+			</xs:complexContent>
+		</xs:complexType>
+	</xs:element>
+	
+	<xs:complexType name="notification">
+		<xs:sequence>
+			<xs:element name="notification-type" type="notification:notification-type" />
+			<xs:element name="authorization-url" type="notification:authorization-url" />
+			<xs:element ref="notification:notification-subject" />
+			<xs:element ref="notification:notification-intro" />
+			<xs:element name="items" type="notification:items" />
+			<xs:element ref="common:created-date" minOccurs="0" />
+			<xs:element ref="common:sent-date" minOccurs="0" />
+			<xs:element ref="common:read-date" minOccurs="0" />
+			<xs:element name="actioned-date" type="notification:actioned-date"
+				minOccurs="0" />
+			<xs:element ref="common:archived-date" minOccurs="0" />
+			<xs:element ref="common:source" minOccurs="0" />
+		</xs:sequence>
+		<xs:attribute name="put-code" type="common:put-code"
+			use="optional" />
+	</xs:complexType>
+	
+	<xs:simpleType name="notification-type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="permission" />
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:complexType name="authorization-url">
+		<xs:sequence>
+			<xs:choice>
+				<xs:sequence>
+					<xs:element name="uri" type="xs:anyURI" />
+					<xs:element name="path" type="xs:string" minOccurs="0" />
+				</xs:sequence>
+				<xs:element name="path" type="xs:string" />
+			</xs:choice>
+			<xs:element name="host" type="xs:string" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+	
+	<xs:element name="notification-subject">
+		<xs:annotation>
+			<xs:documentation>The subject line for the message (displayed to the
+				end user)
+			</xs:documentation>
+		</xs:annotation>
+		<xs:simpleType>
+			<xs:restriction base="xs:string" />
+		</xs:simpleType>
+	</xs:element>
+	<xs:element name="notification-intro">
+		<xs:annotation>
+			<xs:documentation>A text-only introductory message to be displayed to
+				the end user, and displayed before the example list of items.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:simpleType>
+			<xs:restriction base="xs:string">
+				<xs:maxLength value="1000" />
+			</xs:restriction>
+		</xs:simpleType>
+	</xs:element>
+	<xs:complexType name="items">
+		<xs:sequence>
+			<xs:element name="item" type="notification:item"
+				maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="item">
+		<xs:sequence>
+			<xs:element name="item-type" type="notification:activity-type" />
+			<xs:element name="item-name">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:maxLength value="1000" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element ref="common:external-id" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="activity-type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="education"></xs:enumeration>
+			<xs:enumeration value="employment"></xs:enumeration>
+			<xs:enumeration value="funding"></xs:enumeration>
+			<xs:enumeration value="work"></xs:enumeration>
+			<xs:enumeration value="peer-review"></xs:enumeration>
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="actioned-date">
+		<xs:annotation>
+			<xs:documentation>The date time when the user took action on the
+				notification.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:simpleContent>
+			<xs:extension base="xs:dateTime" />
+		</xs:simpleContent>
+	</xs:complexType>
+</xs:schema>

data/resources/{notification_2.0_rc3/samples/notification-custom-2.0_rc3.xml → notification_2.0/samples/notification-custom-2.0.xml}

@@ -19,7 +19,7 @@
 -->
 <notification:notification put-code="1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.orcid.org/ns/notification ../notification-custom-2.0_rc3.xsd"
+    xsi:schemaLocation="http://www.orcid.org/ns/notification ../notification-custom-2.0.xsd"
     xmlns:notification="http://www.orcid.org/ns/notification"
     xmlns:common="http://www.orcid.org/ns/common"
     xml:lang="en-gb">
@@ -32,7 +32,7 @@
             This is an email with <em>important</em> info.
         </p>]]>
     </notification:body-html>
-  <common:created-date>2014-01-01T09:17:56</common:created-date>
+	<common:created-date>2014-01-01T09:17:56</common:created-date>
     <common:sent-date>2014-01-01T14:45:32</common:sent-date>
     <common:source>
         <common:source-orcid>
@@ -42,4 +42,4 @@
         </common:source-orcid>
         <common:source-name>Member 1</common:source-name>
     </common:source>
-</notification:notification>
+</notification:notification>

data/resources/{notification_2.0_rc3/samples/notification-permission-2.0_rc3.xml → notification_2.0/samples/notification-permission-2.0.xml}

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
 <!--
 
     =============================================================================
@@ -17,7 +17,7 @@
     =============================================================================
 
 -->
-<notification:notification put-code="1" xsi:schemaLocation="http://www.orcid.org/ns/notification ../notification-permission-2.0_rc3.xsd" xmlns:common="http://www.orcid.org/ns/common" xmlns:notification="http://www.orcid.org/ns/notification" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<notification:notification put-code="1" xsi:schemaLocation="http://www.orcid.org/ns/notification ../notification-permission-2.0.xsd" xmlns:common="http://www.orcid.org/ns/common" xmlns:notification="http://www.orcid.org/ns/notification" xmlns:activities="http://www.orcid.org/ns/activities" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <notification:notification-type>permission</notification:notification-type>
     <notification:authorization-url>
         <!-- API user can specify just the path if they want, and leave out the uri element. -->