update version and docs for 0.9.7 milestone

adobe · Oct 30, 2018 · 121882c · 121882c
1 parent 011ec93
commit 121882c
Show file tree

Hide file tree

Showing 30 changed files with 1,122 additions and 1,115 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,15 +2,22 @@
 
 ## Release 0.9.7
 
-[Released on October tBD, 2018](https://github.com/adobe/xdm/releases/tag/v0.9.7)
+[Released on October 30, 2018](https://github.com/adobe/xdm/releases/tag/v0.9.7)
 
 Fixed Issues
 
-...
+* Implement a communications subscription Campaign extension
+  * PR #458 Implement a communications subscription Campaign extension
+* Add domain and ISP to environment
+  * PR #537 Add domain and ISP
+* Advertising break should not be required
+  * PR #539 Remove the requirement for offset in advertising break
+* Add xdm:localTimezoneOffset next to xdm:localTime under placecontext
+  * PR #554 Added xdm:localTimezoneOffset to context/placecontext #544
 
 Merged Pull Requests
 
-* #458 Implement a communications subscription Campaign extension.
+* #532 Add producer event source to message/event on pipeline
 
 ## Release 0.9.6
 

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This repository contains the source code for the formal specification of the XDM
 
 ## Current Version
 
-XDM is at version `0.9.6`.
+XDM is at version `0.9.7`.
 
 You can find more about our versioning in [docs/introduction.md](docs/introduction.md#versioning)
 

diff --git a/docs/introduction.md b/docs/introduction.md
@@ -2,7 +2,7 @@
 xdm:navOrder: 1
 ---
 
-# Experience Data Model (XDM) Version 0.9.6
+# Experience Data Model (XDM) Version 0.9.7
 
 ## Introduction
 

diff --git a/docs/reference/README.md b/docs/reference/README.md
diff --git a/docs/reference/common/descriptors/itemselector.schema.json b/docs/reference/common/descriptors/itemselector.schema.json
@@ -78,16 +78,16 @@
     "meta:status": "experimental",
     "examples": [
         {
-            "xdm:id": "https://example.com/objects/12345"
+            "xdm:index": 0
         },
         {
-            "xdm:type": "https://ns.adobe.com/experience/mcid"
+            "xdm:id": "https://example.com/objects/12345"
         },
         {
             "xdm:schema": "https://ns.adobe.com/xdm/context/identity"
         },
         {
-            "xdm:index": 0
+            "xdm:type": "https://ns.adobe.com/experience/mcid"
         }
     ]
 }
diff --git a/docs/reference/common/descriptors/itemselector.schema.md b/docs/reference/common/descriptors/itemselector.schema.md
@@ -18,13 +18,13 @@ Matching may be done based on array index, `@id`, `@type`, or schema URI.
 
 ```json
 {
-  "xdm:id": "https://example.com/objects/12345"
+  "xdm:index": 0
 }
 ```
 
 ```json
 {
-  "xdm:type": "https://ns.adobe.com/experience/mcid"
+  "xdm:id": "https://example.com/objects/12345"
 }
 ```
 
@@ -36,7 +36,7 @@ Matching may be done based on array index, `@id`, `@type`, or schema URI.
 
 ```json
 {
-  "xdm:index": 0
+  "xdm:type": "https://ns.adobe.com/experience/mcid"
 }
 ```
 
diff --git a/docs/reference/common/eventenvelope.schema.json b/docs/reference/common/eventenvelope.schema.json
@@ -42,81 +42,84 @@
     "meta:status": "experimental",
     "examples": [
         {
-            "@type": "https://ns.adobe.com/xdm/common/event/created",
+            "@type": "https://ns.adobe.com/xdm/common/event/updated",
             "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
             "activitystreams:published": "2016-07-16T19:20:30+01:00",
             "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
             "activitystreams:to": {
-                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
-                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
+                "@type": "http://ns.adobe.com/adobecloudplatform/ims/organization",
+                "@id": "08B3E5CE5822FC520A494229@AdobeOrg"
             },
             "activitystreams:generator": {
                 "@type": "https://ns.adobe.com/xdm/content/repository",
-                "xdm:root": "https://cc-api-storage-stage.adobe.io/"
+                "@id": "https://francois.corp.adobe.com:4502/"
             },
             "activitystreams:actor": {
-                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
-                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
+                "@type": "https://ns.adobe.com/experience/aem/user",
+                "@id": "admin"
             },
             "activitystreams:object": {
                 "@type": "https://ns.adobe.com/xdm/assets/asset",
-                "repo:id": "urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
-                "@id": "https://cc-api-storage-stage.adobe.io/id/urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185"
+                "repo:id": "urn:aaid:aem:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
+                "@id": "https://francois.corp.adobe.com:4502/content/dam/Fx_DUKE-small.jpg",
+                "xdm:name": "Fx_DUKE-small.png",
+                "xdm:path": "/content/dam/Fx_DUKE-small.png",
+                "dc:format": "image/png",
+                "repo:etag": "\"6fc55d0389d856ae7wddwebba54f110e\""
             }
         },
         {
-            "@type": "https://ns.adobe.com/xdm/common/event/published",
-            "xdm:objectType": "https://ns.adobe.com/xdm/content/componentized-page",
+            "@type": "https://ns.adobe.com/xdm/common/event/created",
+            "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
             "activitystreams:published": "2016-07-16T19:20:30+01:00",
             "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
             "activitystreams:to": {
-                "@type": "http://ns.adobe.com/adobecloudplatform/ims/organization",
-                "@id": "08B3E5CE5822FC520A494229@AdobeOrg"
+                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
+                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
             },
             "activitystreams:generator": {
                 "@type": "https://ns.adobe.com/xdm/content/repository",
-                "@id": "https://francois.corp.adobe.com:4502/"
+                "xdm:root": "https://cc-api-storage-stage.adobe.io/"
             },
             "activitystreams:actor": {
-                "@type": "https://ns.adobe.com/experience/aem/user",
-                "@id": "admin"
+                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
+                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
             },
             "activitystreams:object": {
-                "@type": "https://ns.adobe.com/xdm/content/componentized-page",
-                "@id": "http://adobesummit.adobesandbox.com:4502/content/geometrixx/en/vintage.html",
-                "dc:title": "Vintage Collection",
-                "xdm:path": "/content/geometrixx/en/vintage.html"
+                "@type": "https://ns.adobe.com/xdm/assets/asset",
+                "repo:id": "urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
+                "@id": "https://cc-api-storage-stage.adobe.io/id/urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
+                "xdm:name": "example.jpg",
+                "xdm:path": "/MyFolder/example.jpg",
+                "dc:format": "image/jpg",
+                "repo:etag": "\"6fc55d0389d856ae7deccebba54f110e\""
             }
         },
         {
-            "@type": "https://ns.adobe.com/xdm/common/event/updated",
+            "@type": "https://ns.adobe.com/xdm/common/event/created",
             "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
             "activitystreams:published": "2016-07-16T19:20:30+01:00",
             "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
             "activitystreams:to": {
-                "@type": "http://ns.adobe.com/adobecloudplatform/ims/organization",
-                "@id": "08B3E5CE5822FC520A494229@AdobeOrg"
+                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
+                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
             },
             "activitystreams:generator": {
                 "@type": "https://ns.adobe.com/xdm/content/repository",
-                "@id": "https://francois.corp.adobe.com:4502/"
+                "xdm:root": "https://cc-api-storage-stage.adobe.io/"
             },
             "activitystreams:actor": {
-                "@type": "https://ns.adobe.com/experience/aem/user",
-                "@id": "admin"
+                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
+                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
             },
             "activitystreams:object": {
                 "@type": "https://ns.adobe.com/xdm/assets/asset",
-                "repo:id": "urn:aaid:aem:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
-                "@id": "https://francois.corp.adobe.com:4502/content/dam/Fx_DUKE-small.jpg",
-                "xdm:name": "Fx_DUKE-small.png",
-                "xdm:path": "/content/dam/Fx_DUKE-small.png",
-                "dc:format": "image/png",
-                "repo:etag": "\"6fc55d0389d856ae7wddwebba54f110e\""
+                "repo:id": "urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
+                "@id": "https://cc-api-storage-stage.adobe.io/id/urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185"
             }
         },
         {
-            "@type": "https://ns.adobe.com/xdm/common/event/unpublished",
+            "@type": "https://ns.adobe.com/xdm/common/event/published",
             "xdm:objectType": "https://ns.adobe.com/xdm/content/componentized-page",
             "activitystreams:published": "2016-07-16T19:20:30+01:00",
             "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
@@ -140,30 +143,27 @@
             }
         },
         {
-            "@type": "https://ns.adobe.com/xdm/common/event/created",
-            "xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
+            "@type": "https://ns.adobe.com/xdm/common/event/unpublished",
+            "xdm:objectType": "https://ns.adobe.com/xdm/content/componentized-page",
             "activitystreams:published": "2016-07-16T19:20:30+01:00",
             "@id": "https://events.adobe.io/event/id/82235bac-2b81-4e70-90b5-2bd1f04b5c7b",
             "activitystreams:to": {
-                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
-                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
+                "@type": "http://ns.adobe.com/adobecloudplatform/ims/organization",
+                "@id": "08B3E5CE5822FC520A494229@AdobeOrg"
             },
             "activitystreams:generator": {
                 "@type": "https://ns.adobe.com/xdm/content/repository",
-                "xdm:root": "https://cc-api-storage-stage.adobe.io/"
+                "@id": "https://francois.corp.adobe.com:4502/"
             },
             "activitystreams:actor": {
-                "@type": "https://ns.adobe.com/adobecloudplatform/ims/user",
-                "@id": "D13A1E7053E46A220A4C86E1@AdobeID"
+                "@type": "https://ns.adobe.com/experience/aem/user",
+                "@id": "admin"
             },
             "activitystreams:object": {
-                "@type": "https://ns.adobe.com/xdm/assets/asset",
-                "repo:id": "urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
-                "@id": "https://cc-api-storage-stage.adobe.io/id/urn:aaid:sc:us:4123ba4c-93a8-4c5d-b979-ffbbe4318185",
-                "xdm:name": "example.jpg",
-                "xdm:path": "/MyFolder/example.jpg",
-                "dc:format": "image/jpg",
-                "repo:etag": "\"6fc55d0389d856ae7deccebba54f110e\""
+                "@type": "https://ns.adobe.com/xdm/content/componentized-page",
+                "@id": "http://adobesummit.adobesandbox.com:4502/content/geometrixx/en/vintage.html",
+                "dc:title": "Vintage Collection",
+                "xdm:path": "/content/geometrixx/en/vintage.html"
             }
         }
     ]