Merge branch 'master' into platform-pr-stabilizing-09

adobe · Apr 4, 2018 · d2a77b9 · d2a77b9
2 parents 1b53208 + 7670cad
commit d2a77b9
Show file tree

Hide file tree

Showing 25 changed files with 347 additions and 365 deletions.
diff --git a/docs/reference/README.md b/docs/reference/README.md
@@ -30,6 +30,30 @@
 * [Product List Item](./content/productlistitem.schema.md) – `https://ns.adobe.com/xdm/content/productlistitem`
 * [Content Repository](./content/repository.schema.md) – `https://ns.adobe.com/xdm/content/repository`
 
+## /context/
+
+* [Browser Details](./context/browserdetails.schema.md) – `https://ns.adobe.com/xdm/context/browserdetails`
+* [Commerce](./context/commerce.schema.md) – `https://ns.adobe.com/xdm/context/commerce`
+* [Device](./context/device.schema.md) – `https://ns.adobe.com/xdm/context/device`
+* [Email Address](./context/emailaddress.schema.md) – `https://ns.adobe.com/xdm/context/emailaddress`
+* [End User IDs](./context/enduserids.schema.md) – `https://ns.adobe.com/xdm/context/enduserids`
+* [Environment](./context/environment.schema.md) – `https://ns.adobe.com/xdm/context/environment`
+* [ExperienceEvent](./context/experienceevent.schema.md) – `https://ns.adobe.com/xdm/context/experienceevent`
+* [Identity](./context/identity.schema.md) – `https://ns.adobe.com/xdm/context/identity`
+* [Location Context](./context/locationcontext.schema.md) – `https://ns.adobe.com/xdm/context/locationcontext`
+* [Marketing](./context/marketing.schema.md) – `https://ns.adobe.com/xdm/context/marketing`
+* [Namespace](./context/namespace.schema.md) – `https://ns.adobe.com/xdm/context/namespace`
+* [OptInOut](./context/optinout.schema.md) – `https://ns.adobe.com/xdm/context/optinout`
+* [Person Name](./context/person-name.schema.md) – `https://ns.adobe.com/xdm/context/person-name`
+* [Person](./context/person.schema.md) – `https://ns.adobe.com/xdm/context/person`
+* [Phone Number](./context/phonenumber.schema.md) – `https://ns.adobe.com/xdm/context/phonenumber`
+* [Place](./context/place.schema.md) – `https://ns.adobe.com/xdm/context/place`
+* [Profile](./context/profile.schema.md) – `https://ns.adobe.com/xdm/context/profile`
+* [Push Notification Token](./context/pushnotificationtoken.schema.md) – `https://ns.adobe.com/xdm/context/pushnotificationtoken`
+* [Search](./context/search.schema.md) – `https://ns.adobe.com/xdm/context/search`
+* [Subscription](./context/subscription.schema.md) – `https://ns.adobe.com/xdm/context/subscription`
+* [Web Link](./context/weblink.schema.md) – `https://ns.adobe.com/xdm/context/weblink`
+
 ## /channels/
 
 * [ADM](./channels/adm.schema.md) – `https://ns.adobe.com/xdm/channels/adm`
@@ -66,30 +90,6 @@
 * [Principal](./common/principal.schema.md) – `https://ns.adobe.com/xdm/common/principal`
 * [Customer Managed Environment](./common/selfservice.schema.md) – `https://ns.adobe.com/xdm/common/selfservice`
 
-## /context/
-
-* [Browser Details](./context/browserdetails.schema.md) – `https://ns.adobe.com/xdm/context/browserdetails`
-* [Commerce](./context/commerce.schema.md) – `https://ns.adobe.com/xdm/context/commerce`
-* [Device](./context/device.schema.md) – `https://ns.adobe.com/xdm/context/device`
-* [Email Address](./context/emailaddress.schema.md) – `https://ns.adobe.com/xdm/context/emailaddress`
-* [End User IDs](./context/enduserids.schema.md) – `https://ns.adobe.com/xdm/context/enduserids`
-* [Environment](./context/environment.schema.md) – `https://ns.adobe.com/xdm/context/environment`
-* [ExperienceEvent](./context/experienceevent.schema.md) – `https://ns.adobe.com/xdm/context/experienceevent`
-* [Identity](./context/identity.schema.md) – `https://ns.adobe.com/xdm/context/identity`
-* [Location Context](./context/locationcontext.schema.md) – `https://ns.adobe.com/xdm/context/locationcontext`
-* [Marketing](./context/marketing.schema.md) – `https://ns.adobe.com/xdm/context/marketing`
-* [Namespace](./context/namespace.schema.md) – `https://ns.adobe.com/xdm/context/namespace`
-* [OptInOut](./context/optinout.schema.md) – `https://ns.adobe.com/xdm/context/optinout`
-* [Person Name](./context/person-name.schema.md) – `https://ns.adobe.com/xdm/context/person-name`
-* [Person](./context/person.schema.md) – `https://ns.adobe.com/xdm/context/person`
-* [Phone Number](./context/phonenumber.schema.md) – `https://ns.adobe.com/xdm/context/phonenumber`
-* [Place](./context/place.schema.md) – `https://ns.adobe.com/xdm/context/place`
-* [Profile](./context/profile.schema.md) – `https://ns.adobe.com/xdm/context/profile`
-* [Push Notification Token](./context/pushnotificationtoken.schema.md) – `https://ns.adobe.com/xdm/context/pushnotificationtoken`
-* [Search](./context/search.schema.md) – `https://ns.adobe.com/xdm/context/search`
-* [Subscription](./context/subscription.schema.md) – `https://ns.adobe.com/xdm/context/subscription`
-* [Web Link](./context/weblink.schema.md) – `https://ns.adobe.com/xdm/context/weblink`
-
 ## /data/
 
 * [abandons](./data/abandons.schema.md) – `https://ns.adobe.com/xdm/data/metrics/commerce/abandons`
@@ -100,11 +100,11 @@
 * [Discount](./data/discount.schema.md) – `https://ns.adobe.com/xdm/data/discount`
 * [impressions](./data/impressions.schema.md) – `https://ns.adobe.com/xdm/data/metrics/advertising/impressions`
 * [link-clicks](./data/link-clicks.schema.md) – `https://ns.adobe.com/xdm/data/metrics/web/link-clicks`
-* [Measure](./data/measure.schema.md) – `https://ns.adobe.com/xdm/data/measure`
 * [Metric](./data/metric.schema.md) – `https://ns.adobe.com/xdm/data/metric`
+* [Measure](./data/measure.schema.md) – `https://ns.adobe.com/xdm/data/measure`
 * [Metrics](./data/metrics.schema.md) – `https://ns.adobe.com/xdm/data/metrics`
-* [mirror-pages](./data/mirror-pages.schema.md) – `https://ns.adobe.com/xdm/data/metrics/direct-marketing/mirror-pages`
 * [non-deliverables](./data/non-deliverables.schema.md) – `https://ns.adobe.com/xdm/data/metrics/direct-marketing/non-deliverables`
+* [mirror-pages](./data/mirror-pages.schema.md) – `https://ns.adobe.com/xdm/data/metrics/direct-marketing/mirror-pages`
 * [Order](./data/order.schema.md) – `https://ns.adobe.com/xdm/data/order`
 * [page-views](./data/page-views.schema.md) – `https://ns.adobe.com/xdm/data/metrics/web/page-views`
 * [Payment Item](./data/paymentitem.schema.md) – `https://ns.adobe.com/xdm/data/paymentitem`
@@ -114,8 +114,8 @@
 * [product-list-reopens](./data/product-list-reopens.schema.md) – `https://ns.adobe.com/xdm/data/metrics/commerce/product-list-reopens`
 * [product-list-views](./data/product-list-views.schema.md) – `https://ns.adobe.com/xdm/data/metrics/commerce/product-list-views`
 * [product-views](./data/product-views.schema.md) – `https://ns.adobe.com/xdm/data/metrics/commerce/product-views`
-* [purchases](./data/purchases.schema.md) – `https://ns.adobe.com/xdm/data/metrics/commerce/purchases`
 * [save-for-laters](./data/save-for-laters.schema.md) – `https://ns.adobe.com/xdm/data/metrics/commerce/save-for-laters`
+* [purchases](./data/purchases.schema.md) – `https://ns.adobe.com/xdm/data/metrics/commerce/purchases`
 * [sends](./data/sends.schema.md) – `https://ns.adobe.com/xdm/data/metrics/direct-marketing/sends`
 * [user-complaints](./data/user-complaints.schema.md) – `https://ns.adobe.com/xdm/data/metrics/direct-marketing/user-complaints`
 
@@ -135,10 +135,15 @@
 * [Unpublished Event](./common/event/unpublished.schema.md) – `https://ns.adobe.com/xdm/common/event/unpublished`
 * [Updated Event](./common/event/updated.schema.md) – `https://ns.adobe.com/xdm/common/event/updated`
 
-## /external/hal/
+## /external/repo/
 
-* [HAL Link](./external/hal/hal-link.schema.md) – `https://ns.adobe.com/xdm/external/hal/link`
-* [HAL Resource](./external/hal/hal.schema.md) – `https://ns.adobe.com/xdm/external/hal/resource`
+* [Access Control Policy](./external/repo/accesscontrolpolicy.schema.md) – `https://ns.adobe.com/xdm/external/repo/accesscontrolpolicy`
+* [Access Control Entry](./external/repo/accesscontrolentry.schema.md) – `https://ns.adobe.com/xdm/external/repo/accesscontrolentry`
+* [Asset](./external/repo/asset.schema.md) – `http://ns.adobe.com/adobecloud/core/1.0/asset`
+* [Common Properties](./external/repo/common.schema.md) – `http://ns.adobe.com/adobecloud/core/1.0`
+* [Directory](./external/repo/directory.schema.md) – `http://ns.adobe.com/adobecloud/core/1.0/directory`
+* [Effective Privileges](./external/repo/effectiveprivileges.schema.md) – `https://ns.adobe.com/xdm/external/repo/effectiveprivileges`
+* [Sub-Directory](./external/repo/sub-directory.schema.md) – `http://ns.adobe.com/adobecloud/core/1.0/sub-directory`
 
 ## /external/activity-streams-2/
 
@@ -154,18 +159,13 @@
 * [RDF Language Tagged String](./external/activity-streams-2/rdf-langstring.schema.md) – `https://ns.adobe.com/xdm/external/activity-streams-2/rdf-langstring`
 * [JSON-LD `@type`](./external/activity-streams-2/type.schema.md) – `https://ns.adobe.com/xdm/external/activity-streams-2/type`
 
-## /external/repo/
-
-* [Access Control Entry](./external/repo/accesscontrolentry.schema.md) – `https://ns.adobe.com/xdm/external/repo/accesscontrolentry`
-* [Access Control Policy](./external/repo/accesscontrolpolicy.schema.md) – `https://ns.adobe.com/xdm/external/repo/accesscontrolpolicy`
-* [Asset](./external/repo/asset.schema.md) – `http://ns.adobe.com/adobecloud/core/1.0/asset`
-* [Common Properties](./external/repo/common.schema.md) – `http://ns.adobe.com/adobecloud/core/1.0`
-* [Directory](./external/repo/directory.schema.md) – `http://ns.adobe.com/adobecloud/core/1.0/directory`
-* [Effective Privileges](./external/repo/effectiveprivileges.schema.md) – `https://ns.adobe.com/xdm/external/repo/effectiveprivileges`
-* [Sub-Directory](./external/repo/sub-directory.schema.md) – `http://ns.adobe.com/adobecloud/core/1.0/sub-directory`
-
 ## /external/schema/
 
 * [Geo Circle](./external/schema/geocircle.schema.md) – `http://schema.org/GeoCircle`
 * [Geo Coordinates](./external/schema/geocoordinates.schema.md) – `http://schema.org/GeoCoordinates`
 * [Geo Shape](./external/schema/geoshape.schema.md) – `http://schema.org/GeoShape`
+
+## /external/hal/
+
+* [HAL Link](./external/hal/hal-link.schema.md) – `https://ns.adobe.com/xdm/external/hal/link`
+* [HAL Resource](./external/hal/hal.schema.md) – `https://ns.adobe.com/xdm/external/hal/resource`
diff --git a/docs/reference/assets/artboard.schema.md b/docs/reference/assets/artboard.schema.md
@@ -41,25 +41,25 @@ Artboards can contain layers and layer groups, but not other artboards.
 
 | Property | Type | Required | Defined by |
 |----------|------|----------|------------|
-| [stLayer:height](#stLayerheight) | `integer` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayerheight) |
-| [stLayer:originX](#stLayeroriginX) | `integer` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayeroriginX) |
-| [stLayer:originY](#stLayeroriginY) | `integer` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayeroriginY) |
-| [stLayer:unit](#stLayerunit) | `string` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayerunit) |
-| [stLayer:width](#stLayerwidth) | `integer` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayerwidth) |
+| [xdm:height](#xdmheight) | `integer` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdmheight) |
 | [xdm:name](#xdmname) | `string` | Optional | Artboard (this schema) |
+| [xdm:originX](#xdmoriginX) | `integer` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdmoriginX) |
+| [xdm:originY](#xdmoriginY) | `integer` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdmoriginY) |
+| [xdm:unit](#xdmunit) | `string` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdmunit) |
+| [xdm:width](#xdmwidth) | `integer` | Optional | [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdmwidth) |
 | `*` | any | Additional | this schema *allows* additional properties |
 
-## stLayer:height
+## xdm:height
 ### Height
 
 Height of the artboard
 
-`stLayer:height`
+`xdm:height`
 * is optional
 * type: `integer`
-* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayer:height)
+* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdm:height)
 
-### stLayer:height Type
+### xdm:height Type
 
 
 `integer`
@@ -69,17 +69,36 @@ Height of the artboard
 
 
 
-## stLayer:originX
+## xdm:name
+
+Name of the artboard. This would be visible to the user and users can specify names that can help them uniquely identfiy different Artboards.
+
+`xdm:name`
+* is optional
+* type: `string`
+* defined in this schema
+
+### xdm:name Type
+
+
+`string`
+
+
+
+
+
+
+## xdm:originX
 ### Origin X
 
 Origin X position - Base system is cartesian, relative to master page and origin in top, left (X increasing to right, Y increasing downwards)
 
-`stLayer:originX`
+`xdm:originX`
 * is optional
 * type: `integer`
-* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayer:originX)
+* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdm:originX)
 
-### stLayer:originX Type
+### xdm:originX Type
 
 
 `integer`
@@ -89,17 +108,17 @@ Origin X position - Base system is cartesian, relative to master page and origin
 
 
 
-## stLayer:originY
+## xdm:originY
 ### Origin Y
 
 Origin Y position - Base system is cartesian, relative to master page and origin in top, left (X increasing to right, Y increasing downwards)
 
-`stLayer:originY`
+`xdm:originY`
 * is optional
 * type: `integer`
-* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayer:originY)
+* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdm:originY)
 
-### stLayer:originY Type
+### xdm:originY Type
 
 
 `integer`
@@ -109,17 +128,17 @@ Origin Y position - Base system is cartesian, relative to master page and origin
 
 
 
-## stLayer:unit
+## xdm:unit
 ### Unit
 
 Unit used for artboard coordinates (`originX`, `originY`, `width` and `height`). For example: `inch`, `mm`, `pixel`, `pica`, `point` (default is `pixel`)
 
-`stLayer:unit`
+`xdm:unit`
 * is optional
 * type: `string`
-* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayer:unit)
+* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdm:unit)
 
-### stLayer:unit Type
+### xdm:unit Type
 
 
 `string`
@@ -129,17 +148,17 @@ Unit used for artboard coordinates (`originX`, `originY`, `width` and `height`).
 
 
 
-## stLayer:width
+## xdm:width
 ### Width
 
 Width of the artboard
 
-`stLayer:width`
+`xdm:width`
 * is optional
 * type: `integer`
-* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#stLayer:width)
+* defined in [Rectangular Object (measured in variable unit)](variable-unit-rectangular.schema.md#xdm:width)
 
-### stLayer:width Type
+### xdm:width Type
 
 
 `integer`
@@ -148,22 +167,3 @@ Width of the artboard
 
 
 
-
-## xdm:name
-
-Name of the artboard. This would be visible to the user and users can specify names that can help them uniquely identfiy different Artboards.
-
-`xdm:name`
-* is optional
-* type: `string`
-* defined in this schema
-
-### xdm:name Type
-
-
-`string`
-
-
-
-
-
diff --git a/docs/reference/assets/layer-group.schema.json b/docs/reference/assets/layer-group.schema.json
@@ -49,23 +49,23 @@
             "xdm:layers": [
                 {
                     "xdm:name": "Example Layer",
-                    "stLayer:width": 768,
-                    "stLayer:height": 768,
-                    "stLayer:originY": 0,
-                    "stLayer:originX": 256,
-                    "stLayer:unit": "pixels",
+                    "xdm:width": 768,
+                    "xdm:height": 768,
+                    "xdm:originY": 0,
+                    "xdm:originX": 256,
+                    "xdm:unit": "pixels",
                     "xdm:visible": true
                 },
                 {
                     "xdm:name": "Nested Layer Group",
                     "xdm:layers": [
                         {
                             "xdm:name": "Example Layer in Nested Layer Group",
-                            "stLayer:width": 768,
-                            "stLayer:height": 768,
-                            "stLayer:originY": 0,
-                            "stLayer:originX": 256,
-                            "stLayer:unit": "pixels",
+                            "xdm:width": 768,
+                            "xdm:height": 768,
+                            "xdm:originY": 0,
+                            "xdm:originX": 256,
+                            "xdm:unit": "pixels",
                             "xdm:visible": false
                         }
                     ]

diff --git a/docs/reference/assets/layer-group.schema.md b/docs/reference/assets/layer-group.schema.md
@@ -21,23 +21,23 @@ A Layer Group can contain layers or other layer groups.
   "xdm:layers": [
     {
       "xdm:name": "Example Layer",
-      "stLayer:width": 768,
-      "stLayer:height": 768,
-      "stLayer:originY": 0,
-      "stLayer:originX": 256,
-      "stLayer:unit": "pixels",
+      "xdm:width": 768,
+      "xdm:height": 768,
+      "xdm:originY": 0,
+      "xdm:originX": 256,
+      "xdm:unit": "pixels",
       "xdm:visible": true
     },
     {
       "xdm:name": "Nested Layer Group",
       "xdm:layers": [
         {
           "xdm:name": "Example Layer in Nested Layer Group",
-          "stLayer:width": 768,
-          "stLayer:height": 768,
-          "stLayer:originY": 0,
-          "stLayer:originX": 256,
-          "stLayer:unit": "pixels",
+          "xdm:width": 768,
+          "xdm:height": 768,
+          "xdm:originY": 0,
+          "xdm:originX": 256,
+          "xdm:unit": "pixels",
           "xdm:visible": false
         }
       ]

diff --git a/docs/reference/assets/layer.schema.json b/docs/reference/assets/layer.schema.json
@@ -45,11 +45,11 @@
     "examples": [
         {
             "xdm:name": "Example Layer",
-            "stLayer:width": 768,
-            "stLayer:height": 768,
-            "stLayer:originY": 0,
-            "stLayer:originX": 256,
-            "stLayer:unit": "pixels",
+            "xdm:width": 768,
+            "xdm:height": 768,
+            "xdm:originY": 0,
+            "xdm:originX": 256,
+            "xdm:unit": "pixels",
             "xdm:visible": true
         }
     ]