Skip to content

Commit

Permalink
Merge pull request #562 from adobe/update-v0.98
Browse files Browse the repository at this point in the history
Update versions and docs for 0.9.8
  • Loading branch information
kstreeter authored Nov 27, 2018
2 parents 5fe4c99 + 6e5e00f commit f237984
Show file tree
Hide file tree
Showing 25 changed files with 542 additions and 528 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## Release 0.9.8

[Released on November 26, 2018](https://github.com/adobe/xdm/releases/tag/v0.9.8)

Fixed Issues

* Add Human Friendly Delivery Template Name in ExperienceEvents
* PR #559 Add templateName to experienceevent campaign extension.

Merged Pull Requests

* #523 Unify representation of end-user identity between ExperienceEvent and Profile
* #552 Added dcx JSON-LD prefix definition & dcx:type property to the meta schema

## Release 0.9.7

[Released on October 30, 2018](https://github.com/adobe/xdm/releases/tag/v0.9.7)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.7`.
XDM is at version `0.9.8`.

You can find more about our versioning in [docs/introduction.md](docs/introduction.md#versioning)

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.7
# Experience Data Model (XDM) Version 0.9.8

## Introduction

Expand Down
Binary file added docs/reference/.DS_Store
Binary file not shown.
76 changes: 38 additions & 38 deletions docs/reference/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,6 @@
* [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)

## /content/

* [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/

* [Address](./common/address.schema.md)`https://ns.adobe.com/xdm/common/address` (Stabilizing)
* [Audit Trail](./common/auditable.schema.md)`https://ns.adobe.com/xdm/common/auditable` (Experimental)
* [Customer Managed Environment](./common/selfservice.schema.md)`https://ns.adobe.com/xdm/common/selfservice` (Experimental)
* [EventEnvelope](./common/eventenvelope.schema.md)`https://ns.adobe.com/xdm/common/eventenvelope` (Experimental)
* [Extensibility base schema](./common/extensible.schema.md)`https://ns.adobe.com/xdm/common/extensible` (Stabilizing)
* [Geo](./common/geo.schema.md)`https://ns.adobe.com/xdm/common/geo` (Experimental)
* [Geographical Unit](./common/geounit.schema.md)`https://ns.adobe.com/xdm/common/geounit` (Experimental)
* [Identity Provider](./common/identity-provider.schema.md)`https://ns.adobe.com/xdm/common/identity-provider` (Experimental)
* [Organization](./common/organization.schema.md)`https://ns.adobe.com/xdm/common/organization` (Stabilizing)
* [Organizational Unit](./common/orgunit.schema.md)`https://ns.adobe.com/xdm/common/orgunit` (Experimental)
* [Page](./common/page.schema.md)`https://ns.adobe.com/xdm/common/page` (Experimental)
* [Principal](./common/principal.schema.md)`https://ns.adobe.com/xdm/common/principal` (Experimental)

## /channels/

* [ADM](./channels/adm.schema.md)`https://ns.adobe.com/xdm/channels/adm` (Experimental)
Expand All @@ -68,6 +43,31 @@
* [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)

## /common/

* [Address](./common/address.schema.md)`https://ns.adobe.com/xdm/common/address` (Stabilizing)
* [Audit Trail](./common/auditable.schema.md)`https://ns.adobe.com/xdm/common/auditable` (Experimental)
* [Customer Managed Environment](./common/selfservice.schema.md)`https://ns.adobe.com/xdm/common/selfservice` (Experimental)
* [EventEnvelope](./common/eventenvelope.schema.md)`https://ns.adobe.com/xdm/common/eventenvelope` (Experimental)
* [Extensibility base schema](./common/extensible.schema.md)`https://ns.adobe.com/xdm/common/extensible` (Stabilizing)
* [Geo](./common/geo.schema.md)`https://ns.adobe.com/xdm/common/geo` (Experimental)
* [Geographical Unit](./common/geounit.schema.md)`https://ns.adobe.com/xdm/common/geounit` (Experimental)
* [Identity Provider](./common/identity-provider.schema.md)`https://ns.adobe.com/xdm/common/identity-provider` (Experimental)
* [Organization](./common/organization.schema.md)`https://ns.adobe.com/xdm/common/organization` (Stabilizing)
* [Organizational Unit](./common/orgunit.schema.md)`https://ns.adobe.com/xdm/common/orgunit` (Experimental)
* [Page](./common/page.schema.md)`https://ns.adobe.com/xdm/common/page` (Experimental)
* [Principal](./common/principal.schema.md)`https://ns.adobe.com/xdm/common/principal` (Experimental)

## /content/

* [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)

## /context/

* [Ad Asset Reference](./context/advertising-timed-asset-reference.schema.md)`https://ns.adobe.com/xdm/context/advertising-timed-asset-reference` (Experimental)
Expand Down Expand Up @@ -197,11 +197,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)

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

* [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)
* [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)

## /common/event/

Expand All @@ -213,11 +213,11 @@
* [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/
## /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)

## /external/activity-streams-2/

Expand All @@ -233,6 +233,11 @@
* [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/hal/

* [HAL Link](./external/hal/hal-link.schema.md)`https://ns.adobe.com/xdm/external/hal/link` (Experimental)
* [HAL Resource](./external/hal/hal.schema.md)`https://ns.adobe.com/xdm/external/hal/resource` (Experimental)

## /external/iptc/

* [Creator](./external/iptc/creator.schema.md)`http://www.iptc.org/creator` (Experimental)
Expand All @@ -251,11 +256,6 @@
* [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/hal/

* [HAL Link](./external/hal/hal-link.schema.md)`https://ns.adobe.com/xdm/external/hal/link` (Experimental)
* [HAL Resource](./external/hal/hal.schema.md)`https://ns.adobe.com/xdm/external/hal/resource` (Experimental)

## /external/schema/

* [Geo Circle](./external/schema/geocircle.schema.md)`http://schema.org/GeoCircle` (Experimental)
Expand Down
Binary file added docs/reference/common/.DS_Store
Binary file not shown.
4 changes: 2 additions & 2 deletions docs/reference/common/descriptors/itemselector.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@
"meta:status": "experimental",
"examples": [
{
"xdm:id": "https://example.com/objects/12345"
"xdm:type": "https://ns.adobe.com/experience/mcid"
},
{
"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"
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/common/descriptors/itemselector.schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Matching may be done based on array index, `@id`, `@type`, or schema URI.

```json
{
"xdm:id": "https://example.com/objects/12345"
"xdm:type": "https://ns.adobe.com/experience/mcid"
}
```

Expand All @@ -30,7 +30,7 @@ Matching may be done based on array index, `@id`, `@type`, or schema URI.

```json
{
"xdm:type": "https://ns.adobe.com/experience/mcid"
"xdm:id": "https://example.com/objects/12345"
}
```

Expand Down
16 changes: 8 additions & 8 deletions docs/reference/common/eventenvelope.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@
"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"
"@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\""
}
},
{
Expand All @@ -84,11 +88,7 @@
"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"
}
},
{
Expand Down Expand Up @@ -119,7 +119,7 @@
}
},
{
"@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",
Expand All @@ -143,7 +143,7 @@
}
},
{
"@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
16 changes: 8 additions & 8 deletions docs/reference/common/eventenvelope.schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream
"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"
"@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\""
}
}
```
Expand All @@ -66,11 +70,7 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream
"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"
}
}
```
Expand Down Expand Up @@ -107,7 +107,7 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream

```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",
Expand All @@ -134,7 +134,7 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream

```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",
Expand Down
8 changes: 4 additions & 4 deletions docs/reference/content/page-component.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
],
"meta:status": "experimental",
"examples": [
{
"@type": "https://francois.corp.adobe.com:4502/apps/foundation/title",
"dc:title": "Protect Your Eyes"
},
{
"@type": "https://francois.corp.adobe.com:4502/apps/foundation/image",
"image": {
"@type": "https://ns.adobe.com/xdm/assets/asset",
"repo:id": "urn:aaid:aem:4123ba4c-93a8-4c5d-b979-1234e4318185",
"@id": "https://francois.corp.adobe.com:4502/content/dam/Glasses-small.jpg"
}
},
{
"@type": "https://francois.corp.adobe.com:4502/apps/foundation/title",
"dc:title": "Protect Your Eyes"
}
]
}
14 changes: 7 additions & 7 deletions docs/reference/content/page-component.schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ The type determines how the component will be displayed, rendered, and authored.

## Page Component Examples

```json
{
"@type": "https://francois.corp.adobe.com:4502/apps/foundation/title",
"dc:title": "Protect Your Eyes"
}
```

```json
{
"@type": "https://francois.corp.adobe.com:4502/apps/foundation/image",
Expand All @@ -39,6 +32,13 @@ The type determines how the component will be displayed, rendered, and authored.
}
```

```json
{
"@type": "https://francois.corp.adobe.com:4502/apps/foundation/title",
"dc:title": "Protect Your Eyes"
}
```


# Page Component Properties

Expand Down
Loading

0 comments on commit f237984

Please sign in to comment.