Merge branch 'master' into add-org-geoUnit

adobe · May 21, 2018 · 727e2bf · 727e2bf
2 parents dd6cae7 + 8b548e3
commit 727e2bf
Show file tree

Hide file tree

Showing 198 changed files with 7,335 additions and 1,139 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,17 @@
 
 [Unreleased](https://github.com/adobe/xdm/releases/tag/v0.9.1)
 
-* Renames all `Metric` schemas to `Metric Definition` #254
+* Renamed all `Metric` schemas to `Metric Definition` #254
+* Moved web metrics used in ExperienceEvent `metrics` to the webinteraction and webpageview contexts #316
+* Renamed web metrics to `xdm:*` compressed type property names #316
+* Moved `commerce` metrics used in ExperienceEvent `metrics` to the `commerce` context #317
+* Renamed `commerce` metrics to `xdm:*` compressed type property names #317
+* `abandons` metric field name change to `cartAbandons` . #317
+* The `commerce` schema is now extensible to allow for additional dimensions and metrics. #317
 * Removed the required constraint from `schemas/external/schema/geo*.schema.json` #315
+* Introduced advertising context to ExperienceEvent #280
+* Introduced advertising and viewability metrics under the advertising context #280
+* Moved impressions and clicks metrics under advertising context #280
+* Added `xdm:primary` flag to `schemas/context/identity.schema.json` #335
+* Corrected naming of EndUserIDs by making them consistent (aaid and acid) `schemas/external/schema/geo*.schema.json` #333
 * Adds new concepts `Organizational Unit` and `Geographical Unit`. Existing links with the `Profile` schema updated. #323
diff --git a/STABILIZING.md b/STABILIZING.md
diff --git a/docs/reference/README.md b/docs/reference/README.md
diff --git a/docs/reference/assets/video.schema.json b/docs/reference/assets/video.schema.json
@@ -65,7 +65,7 @@
     "meta:status": "experimental",
     "examples": [
         {
-            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
+            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
             "xmp:createDate": "2017-09-26T15:52:25+00:00",
             "repo:createdDate": "2017-09-26T15:52:25+00:00",
             "xdm:repositoryCreatedBy": "lars",
@@ -79,11 +79,11 @@
             "tiff:imageLength": 2160,
             "tiff:imageWidth": 3840,
             "xdm:aspectRatio": 1.77777777778,
-            "xdm:extent": 10920000,
-            "xdm:videoFrameRate": "f48s1"
+            "xdm:extent": 11700000,
+            "xdm:videoFrameRate": "NTSC"
         },
         {
-            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
+            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
             "xmp:createDate": "2017-09-26T15:52:25+00:00",
             "repo:createdDate": "2017-09-26T15:52:25+00:00",
             "xdm:repositoryCreatedBy": "lars",
@@ -97,8 +97,8 @@
             "tiff:imageLength": 2160,
             "tiff:imageWidth": 3840,
             "xdm:aspectRatio": 1.77777777778,
-            "xdm:extent": 11700000,
-            "xdm:videoFrameRate": "NTSC"
+            "xdm:extent": 10920000,
+            "xdm:videoFrameRate": "f48s1"
         }
     ]
 }
diff --git a/docs/reference/assets/video.schema.md b/docs/reference/assets/video.schema.md
@@ -21,7 +21,7 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
 
 ```json
 {
-  "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
+  "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
   "xmp:createDate": "2017-09-26T15:52:25+00:00",
   "repo:createdDate": "2017-09-26T15:52:25+00:00",
   "xdm:repositoryCreatedBy": "lars",
@@ -35,14 +35,14 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
   "tiff:imageLength": 2160,
   "tiff:imageWidth": 3840,
   "xdm:aspectRatio": 1.77777777778,
-  "xdm:extent": 10920000,
-  "xdm:videoFrameRate": "f48s1"
+  "xdm:extent": 11700000,
+  "xdm:videoFrameRate": "NTSC"
 }
 ```
 
 ```json
 {
-  "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ac",
+  "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ad",
   "xmp:createDate": "2017-09-26T15:52:25+00:00",
   "repo:createdDate": "2017-09-26T15:52:25+00:00",
   "xdm:repositoryCreatedBy": "lars",
@@ -56,8 +56,8 @@ The Video class is for video assets, i.e. assets that consist of moving pictures
   "tiff:imageLength": 2160,
   "tiff:imageWidth": 3840,
   "xdm:aspectRatio": 1.77777777778,
-  "xdm:extent": 11700000,
-  "xdm:videoFrameRate": "NTSC"
+  "xdm:extent": 10920000,
+  "xdm:videoFrameRate": "f48s1"
 }
 ```
 

diff --git a/docs/reference/common/eventenvelope.schema.json b/docs/reference/common/eventenvelope.schema.json
@@ -69,34 +69,30 @@
             }
         },
         {
-            "@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:assetID": "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:assetID": "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",
@@ -120,30 +116,34 @@
             }
         },
         {
-            "@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:assetID": "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:assetID": "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",
+            "@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",

diff --git a/docs/reference/common/eventenvelope.schema.md b/docs/reference/common/eventenvelope.schema.md
@@ -51,37 +51,33 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream
 
 ```json
 {
-  "@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:assetID": "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:assetID": "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"
   }
 }
 ```
 
 ```json
 {
-  "@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",
@@ -108,33 +104,37 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream
 
 ```json
 {
-  "@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:assetID": "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:assetID": "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\""
   }
 }
 ```
 
 ```json
 {
-  "@type": "https://ns.adobe.com/xdm/common/event/published",
+  "@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",

diff --git a/docs/reference/common/extensible.schema.json b/docs/reference/common/extensible.schema.json
@@ -250,6 +250,35 @@
     ],
     "meta:status": "stabilizing",
     "examples": [
+        {
+            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ab",
+            "xdm:createDate": "2017-09-26T15:52:25+00:00",
+            "repo:createdDate": "2017-09-26T15:52:25+00:00",
+            "xdm:repositoryCreatedBy": "lars",
+            "xdm:modifyDate": "2017-09-26T15:52:25+00:00",
+            "repo:lastModifiedDate": "2017-09-26T15:52:25+00:00",
+            "xdm:repositoryLastModifiedBy": "2017-09-26T15:52:25+00:00",
+            "repo:version": "15",
+            "dc:title": "This is an example",
+            "repo:size": 1632418,
+            "xdm:path": "/here",
+            "repo:etag": "15"
+        },
+        {
+            "https://ns.example.com/asset_name": "custom_asset_1",
+            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ab",
+            "xdm:createDate": "2017-09-26T15:52:25+00:00",
+            "repo:createdDate": "2017-09-26T15:52:25+00:00",
+            "xdm:repositoryCreatedBy": "lars",
+            "xdm:modifyDate": "2017-09-26T15:52:25+00:00",
+            "repo:lastModifiedDate": "2017-09-26T15:52:25+00:00",
+            "xdm:repository_lastModifiedBy": "2017-09-26T15:52:25+00:00",
+            "repo:version": "15",
+            "dc:title": "This is an example",
+            "repo:size": 1632418,
+            "xdm:path": "/here",
+            "repo:etag": "15"
+        },
         {
             "@context": {
                 "xdm": "https://ns.adobe.com/xdm/",
@@ -294,35 +323,6 @@
             "repo:size": 1632418,
             "xdm:path": "here",
             "repo:etag": "15"
-        },
-        {
-            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ab",
-            "xdm:createDate": "2017-09-26T15:52:25+00:00",
-            "repo:createdDate": "2017-09-26T15:52:25+00:00",
-            "xdm:repositoryCreatedBy": "lars",
-            "xdm:modifyDate": "2017-09-26T15:52:25+00:00",
-            "repo:lastModifiedDate": "2017-09-26T15:52:25+00:00",
-            "xdm:repositoryLastModifiedBy": "2017-09-26T15:52:25+00:00",
-            "repo:version": "15",
-            "dc:title": "This is an example",
-            "repo:size": 1632418,
-            "xdm:path": "/here",
-            "repo:etag": "15"
-        },
-        {
-            "https://ns.example.com/asset_name": "custom_asset_1",
-            "repo:assetID": "urn:aaid:a:b:01234578-0123-ABCD-abcd-0123456789ab",
-            "xdm:createDate": "2017-09-26T15:52:25+00:00",
-            "repo:createdDate": "2017-09-26T15:52:25+00:00",
-            "xdm:repositoryCreatedBy": "lars",
-            "xdm:modifyDate": "2017-09-26T15:52:25+00:00",
-            "repo:lastModifiedDate": "2017-09-26T15:52:25+00:00",
-            "xdm:repository_lastModifiedBy": "2017-09-26T15:52:25+00:00",
-            "repo:version": "15",
-            "dc:title": "This is an example",
-            "repo:size": 1632418,
-            "xdm:path": "/here",
-            "repo:etag": "15"
         }
     ]
 }