Skip to content

Commit

Permalink
Merge pull request #478 from adobe/update-v0.94
Browse files Browse the repository at this point in the history
Updating version, changelog, docs for 0.9.4
  • Loading branch information
kstreeter authored Aug 17, 2018
2 parents 0644c75 + 304b6cb commit 582de66
Show file tree
Hide file tree
Showing 20 changed files with 956 additions and 939 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,21 @@

## Release 0.9.4

_Planned for August 17, 2018_
[Released on August 17, 2018](https://github.com/adobe/xdm/releases/tag/v0.9.4)

Fixed Issues

* Need representation for stitched profiles and segment membership in ExperienceEvent
* PR #444 profile stitch

Merged Pull Requests

* #411 Payload value types
* #445 Change repo:assetID to repo:id
* #456 Adding Target Activities elements
* #459 Added Authenticated State property to `\context\identity.schema.json`
* #474 Minor refactor of segment membership schemas to be more tool friendly
* #475 Make experience schemas xed convertable for 0.9.9.4 release

## Release 0.9.3

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

## Introduction

Expand Down
108 changes: 54 additions & 54 deletions docs/reference/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@



## /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)

## /assets/

* [Aggregated Asset](./assets/aggregated-asset.schema.md)`https://ns.adobe.com/xdm/assets/aggregated-asset` (Experimental)
Expand All @@ -20,6 +30,21 @@
* [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)

## /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 @@ -43,16 +68,6 @@
* [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/

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

## /data/

* [10% Progress Marker](./data/progress10.schema.md)`https://ns.adobe.com/xdm/data/progress10` (Stabilizing)
Expand Down Expand Up @@ -180,27 +195,33 @@
* [Web Page Details](./context/webpagedetails.schema.md)`https://ns.adobe.com/xdm/context/webpagedetails` (Stabilizing)
* [Web Referrer](./context/webreferrer.schema.md)`https://ns.adobe.com/xdm/context/webreferrer` (Stabilizing)

## /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/repository-policies/

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

* [Created Event](./common/event/created.schema.md)`https://ns.adobe.com/xdm/common/event/created` (Experimental)
* [Deleted Event](./common/event/deleted.schema.md)`https://ns.adobe.com/xdm/common/event/deleted` (Experimental)
* [Emitted Event](./common/event/emitted.schema.md)`https://ns.adobe.com/xdm/common/event/emitted` (Experimental)
* [Published Event](./common/event/published.schema.md)`https://ns.adobe.com/xdm/common/event/published` (Experimental)
* [Rejected Event](./common/event/rejected.schema.md)`https://ns.adobe.com/xdm/common/event/rejected` (Experimental)
* [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)
* [HAL Resource](./external/hal/hal.schema.md)`https://ns.adobe.com/xdm/external/hal/resource` (Experimental)

## /external/activity-streams-2/

* [Activity](./external/activity-streams-2/activity.schema.md)`https://ns.adobe.com/xdm/external/activity-streams-2/activity` (Experimental)
Expand All @@ -215,10 +236,15 @@
* [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/
## /external/repo/

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

Expand All @@ -234,29 +260,3 @@
* [Geo Coordinates](./external/schema/geocoordinates.schema.md)`http://schema.org/GeoCoordinates` (Experimental)
* [Geo Shape](./external/schema/geoshape.schema.md)`http://schema.org/GeoShape` (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)

## /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)

## /common/event/

* [Created Event](./common/event/created.schema.md)`https://ns.adobe.com/xdm/common/event/created` (Experimental)
* [Deleted Event](./common/event/deleted.schema.md)`https://ns.adobe.com/xdm/common/event/deleted` (Experimental)
* [Emitted Event](./common/event/emitted.schema.md)`https://ns.adobe.com/xdm/common/event/emitted` (Experimental)
* [Published Event](./common/event/published.schema.md)`https://ns.adobe.com/xdm/common/event/published` (Experimental)
* [Rejected Event](./common/event/rejected.schema.md)`https://ns.adobe.com/xdm/common/event/rejected` (Experimental)
* [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)

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 @@ -77,17 +77,17 @@
],
"meta:status": "experimental",
"examples": [
{
"xdm:type": "https://ns.adobe.com/experience/mcid"
},
{
"xdm:index": 0
},
{
"xdm:schema": "https://ns.adobe.com/xdm/context/identity"
"xdm:type": "https://ns.adobe.com/experience/mcid"
},
{
"xdm:id": "https://example.com/objects/12345"
},
{
"xdm:schema": "https://ns.adobe.com/xdm/context/identity"
}
]
}
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: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"
}
```

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

54 changes: 27 additions & 27 deletions docs/reference/common/eventenvelope.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,33 @@
"@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/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": "https://ns.adobe.com/adobecloudplatform/ims/user",
"@id": "D13A1E7053E46A220A4C86E1@AdobeID"
},
"activitystreams:generator": {
"@type": "https://ns.adobe.com/xdm/content/repository",
"xdm:root": "https://cc-api-storage-stage.adobe.io/"
},
"activitystreams:actor": {
"@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: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",
"xdm:objectType": "https://ns.adobe.com/xdm/assets/asset",
Expand Down Expand Up @@ -115,33 +142,6 @@
"xdm:path": "/content/geometrixx/en/vintage.html"
}
},
{
"@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": "https://ns.adobe.com/adobecloudplatform/ims/user",
"@id": "D13A1E7053E46A220A4C86E1@AdobeID"
},
"activitystreams:generator": {
"@type": "https://ns.adobe.com/xdm/content/repository",
"xdm:root": "https://cc-api-storage-stage.adobe.io/"
},
"activitystreams:actor": {
"@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: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/unpublished",
"xdm:objectType": "https://ns.adobe.com/xdm/content/componentized-page",
Expand Down
60 changes: 30 additions & 30 deletions docs/reference/common/eventenvelope.schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,36 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream
}
```

```json
{
"@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": "https://ns.adobe.com/adobecloudplatform/ims/user",
"@id": "D13A1E7053E46A220A4C86E1@AdobeID"
},
"activitystreams:generator": {
"@type": "https://ns.adobe.com/xdm/content/repository",
"xdm:root": "https://cc-api-storage-stage.adobe.io/"
},
"activitystreams:actor": {
"@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: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\""
}
}
```

```json
{
"@type": "https://ns.adobe.com/xdm/common/event/updated",
Expand Down Expand Up @@ -102,36 +132,6 @@ An `EventEnvelope` is a type of `Activity` (in the sense of [W3C Activity Stream
}
```

```json
{
"@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": "https://ns.adobe.com/adobecloudplatform/ims/user",
"@id": "D13A1E7053E46A220A4C86E1@AdobeID"
},
"activitystreams:generator": {
"@type": "https://ns.adobe.com/xdm/content/repository",
"xdm:root": "https://cc-api-storage-stage.adobe.io/"
},
"activitystreams:actor": {
"@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: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\""
}
}
```

```json
{
"@type": "https://ns.adobe.com/xdm/common/event/unpublished",
Expand Down
Loading

0 comments on commit 582de66

Please sign in to comment.