Skip to content

Commit

Permalink
Merge pull request #503 from adobe/update-v0.95
Browse files Browse the repository at this point in the history
Update version, changelog, and docs for 0.9.5
  • Loading branch information
kstreeter authored Aug 31, 2018
2 parents e8bc768 + 6d59ef7 commit 8f7636e
Show file tree
Hide file tree
Showing 26 changed files with 914 additions and 895 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# Changelog

## Release 0.9.5

[Released on August 31, 2018](https://github.com/adobe/xdm/releases/tag/v0.9.5)

Fixed Issues

* Change ID format from "uri" to "uri-reference"
* PR #488 Change @id's format from "uri" to "uri-reference" if exists
* Combine individual Birthday fields to a single field of format: 'date-time'
* PR #498 Create distinct fields for different cases of birth date
* Fix lint checks against extensions
* PR #485 fix linting issues in extensions folder

Merged Pull Requests

* #472 Add Journey context and delivery attributes in experience event
* #479 Fix Segment Identity title conflict
* #501 Campaign extension schema format/structure change for 0.9.9.5 platform release

## Release 0.9.4

[Released on August 17, 2018](https://github.com/adobe/xdm/releases/tag/v0.9.4)
Expand Down
2 changes: 1 addition & 1 deletion docs/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xdm:navOrder: 1
---

# Experience Data Model (XDM) Version 0.9.4
# Experience Data Model (XDM) Version 0.9.5

## Introduction

Expand Down
80 changes: 40 additions & 40 deletions docs/reference/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,15 @@



## /assets/
## /content/

* [Aggregated Asset](./assets/aggregated-asset.schema.md)`https://ns.adobe.com/xdm/assets/aggregated-asset` (Experimental)
* [Artboard](./assets/artboard.schema.md)`https://ns.adobe.com/xdm/assets/artboard` (Experimental)
* [Asset](./assets/asset.schema.md)`https://ns.adobe.com/xdm/assets/asset` (Experimental)
* [Copyright Owner](./assets/copyright-owner.schema.md)`https://ns.adobe.com/xdm/assets/copyright-owner` (Stabilizing)
* [Font](./assets/font.schema.md)`https://ns.adobe.com/xdm/assets/font` (Experimental)
* [Image](./assets/image.schema.md)`https://ns.adobe.com/xdm/assets/image` (Experimental)
* [Language Alternative](./assets/language-alternative.schema.md)`https://ns.adobe.com/xdm/assets/language-alternative` (Stabilizing)
* [Layer](./assets/layer.schema.md)`https://ns.adobe.com/xdm/assets/layer` (Experimental)
* [Layer Group](./assets/layer-group.schema.md)`https://ns.adobe.com/xdm/assets/layer-group` (Experimental)
* [Rectangular Object (measured in variable unit)](./assets/variable-unit-rectangular.schema.md)`https://ns.adobe.com/xdm/assets/variable-unit-rectangular` (Experimental)
* [Resource Event](./assets/resource-event.schema.md)`https://ns.adobe.com/xdm/assets/resource-event` (Experimental)
* [Simple Rectangular Area](./assets/rectangular.schema.md)`https://ns.adobe.com/xdm/assets/rectangular` (Stabilizing)
* [Video](./assets/video.schema.md)`https://ns.adobe.com/xdm/assets/video` (Experimental)
* [Component Container](./content/component-container.schema.md)`https://ns.adobe.com/xdm/content/component-container` (Experimental)
* [Componentized Page](./content/componentized-page.schema.md)`https://ns.adobe.com/xdm/content/componentized-page` (Experimental)
* [Content](./content/content.schema.md)`https://ns.adobe.com/xdm/content/content` (Experimental)
* [Content Repository](./content/repository.schema.md)`https://ns.adobe.com/xdm/content/repository` (Experimental)
* [Page Component](./content/page-component.schema.md)`https://ns.adobe.com/xdm/content/page-component` (Experimental)
* [Product](./content/product.schema.md)`https://ns.adobe.com/xdm/context/product` (Experimental)
* [Product List Item](./content/productlistitem.schema.md)`https://ns.adobe.com/xdm/content/productlistitem` (Experimental)

## /common/

Expand Down Expand Up @@ -58,15 +52,21 @@
* [Web](./channels/mobile-app.schema.md)`https://ns.adobe.com/xdm/channels/mobile-app` (Experimental)
* [Web](./channels/web.schema.md)`https://ns.adobe.com/xdm/channels/web` (Experimental)

## /content/
## /assets/

* [Component Container](./content/component-container.schema.md)`https://ns.adobe.com/xdm/content/component-container` (Experimental)
* [Componentized Page](./content/componentized-page.schema.md)`https://ns.adobe.com/xdm/content/componentized-page` (Experimental)
* [Content](./content/content.schema.md)`https://ns.adobe.com/xdm/content/content` (Experimental)
* [Content Repository](./content/repository.schema.md)`https://ns.adobe.com/xdm/content/repository` (Experimental)
* [Page Component](./content/page-component.schema.md)`https://ns.adobe.com/xdm/content/page-component` (Experimental)
* [Product](./content/product.schema.md)`https://ns.adobe.com/xdm/context/product` (Experimental)
* [Product List Item](./content/productlistitem.schema.md)`https://ns.adobe.com/xdm/content/productlistitem` (Experimental)
* [Aggregated Asset](./assets/aggregated-asset.schema.md)`https://ns.adobe.com/xdm/assets/aggregated-asset` (Experimental)
* [Artboard](./assets/artboard.schema.md)`https://ns.adobe.com/xdm/assets/artboard` (Experimental)
* [Asset](./assets/asset.schema.md)`https://ns.adobe.com/xdm/assets/asset` (Experimental)
* [Copyright Owner](./assets/copyright-owner.schema.md)`https://ns.adobe.com/xdm/assets/copyright-owner` (Stabilizing)
* [Font](./assets/font.schema.md)`https://ns.adobe.com/xdm/assets/font` (Experimental)
* [Image](./assets/image.schema.md)`https://ns.adobe.com/xdm/assets/image` (Experimental)
* [Language Alternative](./assets/language-alternative.schema.md)`https://ns.adobe.com/xdm/assets/language-alternative` (Stabilizing)
* [Layer](./assets/layer.schema.md)`https://ns.adobe.com/xdm/assets/layer` (Experimental)
* [Layer Group](./assets/layer-group.schema.md)`https://ns.adobe.com/xdm/assets/layer-group` (Experimental)
* [Rectangular Object (measured in variable unit)](./assets/variable-unit-rectangular.schema.md)`https://ns.adobe.com/xdm/assets/variable-unit-rectangular` (Experimental)
* [Resource Event](./assets/resource-event.schema.md)`https://ns.adobe.com/xdm/assets/resource-event` (Experimental)
* [Simple Rectangular Area](./assets/rectangular.schema.md)`https://ns.adobe.com/xdm/assets/rectangular` (Stabilizing)
* [Video](./assets/video.schema.md)`https://ns.adobe.com/xdm/assets/video` (Experimental)

## /context/

Expand Down Expand Up @@ -195,11 +195,11 @@
* [viewable-midpoints](./data/viewablemidpoints.schema.md)`https://ns.adobe.com/xdm/data/viewablemidpoints` (Stabilizing)
* [viewable-third-quartiles](./data/viewablethirdquartiles.schema.md)`https://ns.adobe.com/xdm/data/viewablethirdquartiles` (Stabilizing)

## /common/descriptors/
## /content/repository-policies/

* [Item Selector](./common/descriptors/itemselector.schema.md)`https://ns.adobe.com/xdm/common/descriptors/itemselector` (Experimental)
* [Relationship Descriptor](./common/descriptors/relationshipdescriptor.schema.md)`https://ns.adobe.com/xdm/common/descriptors/relationshipdescriptor` (Experimental)
* [Schema Descriptor](./common/descriptors/schemadescriptor.schema.md)`https://ns.adobe.com/xdm/common/desciptors/schemadescriptor` (Experimental)
* [At-Rest Encryption](./content/repository-policies/encryption.schema.md)`https://ns.adobe.com/xdm/content/repository-policies/encryption` (Experimental)
* [Storage Quota](./content/repository-policies/quota.schema.md)`https://ns.adobe.com/xdm/content/repository-policies/quota` (Experimental)
* [Versioning](./content/repository-policies/versioning.schema.md)`https://ns.adobe.com/xdm/content/repository-policies/versioning` (Experimental)

## /common/event/

Expand All @@ -211,6 +211,12 @@
* [Unpublished Event](./common/event/unpublished.schema.md)`https://ns.adobe.com/xdm/common/event/unpublished` (Experimental)
* [Updated Event](./common/event/updated.schema.md)`https://ns.adobe.com/xdm/common/event/updated` (Experimental)

## /common/descriptors/

* [Item Selector](./common/descriptors/itemselector.schema.md)`https://ns.adobe.com/xdm/common/descriptors/itemselector` (Experimental)
* [Relationship Descriptor](./common/descriptors/relationshipdescriptor.schema.md)`https://ns.adobe.com/xdm/common/descriptors/relationshipdescriptor` (Experimental)
* [Schema Descriptor](./common/descriptors/schemadescriptor.schema.md)`https://ns.adobe.com/xdm/common/desciptors/schemadescriptor` (Experimental)

## /external/hal/

* [HAL Link](./external/hal/hal-link.schema.md)`https://ns.adobe.com/xdm/external/hal/link` (Experimental)
Expand All @@ -230,16 +236,6 @@
* [Object](./external/activity-streams-2/object.schema.md)`https://ns.adobe.com/xdm/external/activity-streams-2/object` (Experimental)
* [RDF Language Tagged String](./external/activity-streams-2/rdf-langstring.schema.md)`https://ns.adobe.com/xdm/external/activity-streams-2/rdf-langstring` (Experimental)

## /external/repo/

* [Access Control Entry](./external/repo/accesscontrolentry.schema.md)`https://ns.adobe.com/xdm/external/repo/accesscontrolentry` (Experimental)
* [Access Control Policy](./external/repo/accesscontrolpolicy.schema.md)`https://ns.adobe.com/xdm/external/repo/accesscontrolpolicy` (Experimental)
* [Asset](./external/repo/asset.schema.md)`http://ns.adobe.com/adobecloud/core/1.0/asset` (Experimental)
* [Common Properties](./external/repo/common.schema.md)`http://ns.adobe.com/adobecloud/core/1.0` (Experimental)
* [Directory](./external/repo/directory.schema.md)`http://ns.adobe.com/adobecloud/core/1.0/directory` (Experimental)
* [Effective Privileges](./external/repo/effectiveprivileges.schema.md)`https://ns.adobe.com/xdm/external/repo/effectiveprivileges` (Experimental)
* [Sub-Directory](./external/repo/sub-directory.schema.md)`http://ns.adobe.com/adobecloud/core/1.0/sub-directory` (Experimental)

## /external/schema/

* [Geo Circle](./external/schema/geocircle.schema.md)`http://schema.org/GeoCircle` (Experimental)
Expand All @@ -254,9 +250,13 @@
* [Season](./external/iptc/season.schema.md)`http://www.iptc.org/episode` (Experimental)
* [Series](./external/iptc/series.schema.md)`http://www.iptc.org/series` (Experimental)

## /content/repository-policies/
## /external/repo/

* [At-Rest Encryption](./content/repository-policies/encryption.schema.md)`https://ns.adobe.com/xdm/content/repository-policies/encryption` (Experimental)
* [Storage Quota](./content/repository-policies/quota.schema.md)`https://ns.adobe.com/xdm/content/repository-policies/quota` (Experimental)
* [Versioning](./content/repository-policies/versioning.schema.md)`https://ns.adobe.com/xdm/content/repository-policies/versioning` (Experimental)
* [Access Control Entry](./external/repo/accesscontrolentry.schema.md)`https://ns.adobe.com/xdm/external/repo/accesscontrolentry` (Experimental)
* [Access Control Policy](./external/repo/accesscontrolpolicy.schema.md)`https://ns.adobe.com/xdm/external/repo/accesscontrolpolicy` (Experimental)
* [Asset](./external/repo/asset.schema.md)`http://ns.adobe.com/adobecloud/core/1.0/asset` (Experimental)
* [Common Properties](./external/repo/common.schema.md)`http://ns.adobe.com/adobecloud/core/1.0` (Experimental)
* [Directory](./external/repo/directory.schema.md)`http://ns.adobe.com/adobecloud/core/1.0/directory` (Experimental)
* [Effective Privileges](./external/repo/effectiveprivileges.schema.md)`https://ns.adobe.com/xdm/external/repo/effectiveprivileges` (Experimental)
* [Sub-Directory](./external/repo/sub-directory.schema.md)`http://ns.adobe.com/adobecloud/core/1.0/sub-directory` (Experimental)

8 changes: 4 additions & 4 deletions docs/reference/common/descriptors/itemselector.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@
"meta:status": "experimental",
"examples": [
{
"xdm:type": "https://ns.adobe.com/experience/mcid"
"xdm:index": 0
},
{
"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"
},
{
"xdm:schema": "https://ns.adobe.com/xdm/context/identity"
"xdm:id": "https://example.com/objects/12345"
}
]
}
8 changes: 4 additions & 4 deletions docs/reference/common/descriptors/itemselector.schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,25 @@ Matching may be done based on array index, `@id`, `@type`, or schema URI.

```json
{
"xdm:type": "https://ns.adobe.com/experience/mcid"
"xdm:index": 0
}
```

```json
{
"xdm:id": "https://example.com/objects/12345"
"xdm:schema": "https://ns.adobe.com/xdm/context/identity"
}
```

```json
{
"xdm:index": 0
"xdm:type": "https://ns.adobe.com/experience/mcid"
}
```

```json
{
"xdm:schema": "https://ns.adobe.com/xdm/context/identity"
"xdm:id": "https://example.com/objects/12345"
}
```

68 changes: 34 additions & 34 deletions docs/reference/common/eventenvelope.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,31 +42,32 @@
"meta:status": "experimental",
"examples": [
{
"@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/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",
"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"
"@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/common/event/unpublished",
"xdm:objectType": "https://ns.adobe.com/xdm/content/componentized-page",
"@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": {
Expand All @@ -82,10 +83,13 @@
"@id": "admin"
},
"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: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\""
}
},
{
Expand All @@ -108,42 +112,38 @@
"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\""
"@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/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",
"xdm:name": "example.jpg",
"xdm:path": "/MyFolder/example.jpg",
"dc:format": "image/jpg",
"repo:etag": "\"6fc55d0389d856ae7deccebba54f110e\""
}
},
{
"@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",
Expand Down
Loading

0 comments on commit 8f7636e

Please sign in to comment.