Merge pull request #475 from adobe/platform-pr-issue473

[issue473]: Make experience schemas xed convertable for 0.9.9.4 release
adobe · Aug 17, 2018 · 6d9b408 · 6d9b408
2 parents e2b15d5 + 04b7ffe
commit 6d9b408
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 10 deletions.
diff --git a/extensions/adobe/experience/experienceevent.schema.json b/extensions/adobe/experience/experienceevent.schema.json
@@ -31,7 +31,7 @@
       "$ref": "https://ns.adobe.com/experience/analytics/experienceevent"
     },
     {
-      "$ref": "https://ns.adobe.com/xdm/experience/target/experienceevent"
+      "$ref": "https://ns.adobe.com/experience/target/experienceevent"
     },
     {
       "$ref": "https://ns.adobe.com/experience/campaign/experienceevent"

diff --git a/...perience/target/activityevent.schema.json → ...target/activity/activityevent.schema.json b/...perience/target/activityevent.schema.json → ...target/activity/activityevent.schema.json
@@ -51,7 +51,7 @@
           "description": "The Capture Score engagement metric calculates an aggregated score based on the value assigned to pages visited on the site, from the point the visitor first sees the campaign's first display mbox."
         },
         "xdm:eventScope": {
-          "$ref": "https://ns.adobe.com/experience/target/activity/activityevent/eventscope"
+          "$ref": "https://ns.adobe.com/experience/target/activity/activityevent/eventscope#/definitions/eventscope"
         },
         "xdm:segmentEvents": {
           "type": "array",

diff --git a/...e/target/activityeventcontext.schema.json → ...ctivity/activityevent/context.schema.json b/...e/target/activityeventcontext.schema.json → ...ctivity/activityevent/context.schema.json
diff --git a/.../experience/target/eventscope.schema.json → ...vity/activityevent/eventscope.schema.json b/.../experience/target/eventscope.schema.json → ...vity/activityevent/eventscope.schema.json
@@ -25,10 +25,5 @@
       }
     }
   },
-  "allOf": [
-    {
-      "$ref": "#/definitions/eventscope"
-    }
-  ],
   "meta:status": "experimental"
 }
diff --git a/...experience/target/optionevent.schema.json → ...ity/activityevent/optionevent.schema.json b/...experience/target/optionevent.schema.json → ...ity/activityevent/optionevent.schema.json
@@ -15,6 +15,7 @@
       "properties": {
         "https://ns.adobe.com/experience/target/activity/activityevent/optionevent/activityLocation": {
           "title": "Activity Location",
+          "type": "object",
           "description": "A location is a page on your website. It could also refer to a place in a mobile app, an email, or any other place where you run an optimization.",
           "properties": {
             "xdm:locationID": {
@@ -34,6 +35,7 @@
         },
         "https://ns.adobe.com/experience/target/activity/activityevent/optionevent/targetOption": {
           "title": "Activity Option",
+          "type": "object",
           "description": "An option is the displayed content on your web pages during activities.",
           "properties": {
             "xdm:optionID": {
@@ -57,7 +59,7 @@
           ]
         },
         "xdm:eventScope": {
-          "$ref": "https://ns.adobe.com/experience/target/activity/activityevent/eventscope"
+          "$ref": "https://ns.adobe.com/experience/target/activity/activityevent/eventscope#/definitions/eventscope"
         }
       },
       "required": [

diff --git a/...xperience/target/segmentevent.schema.json → ...ty/activityevent/segmentevent.schema.json b/...xperience/target/segmentevent.schema.json → ...ty/activityevent/segmentevent.schema.json
@@ -19,7 +19,7 @@
           "description": "Activity Segment Event."
         },
         "xdm:eventScope": {
-          "$ref": "https://ns.adobe.com/experience/target/activity/activityevent/eventscope"
+          "$ref": "https://ns.adobe.com/experience/target/activity/activityevent/eventscope#/definitions/eventscope"
         }
       },
       "required": [

diff --git a/...rience/target/activitypreview.schema.json → ...ience/target/activity/preview.schema.json b/...rience/target/activitypreview.schema.json → ...ience/target/activity/preview.schema.json
diff --git a/extensions/adobe/experience/target/experienceevent.schema.json b/extensions/adobe/experience/target/experienceevent.schema.json
@@ -52,7 +52,7 @@
           "type": "string",
           "description": "Identifier of the environment on which the event was processed."
         },
-        "xdm:activities": {
+        "https://ns.adobe.com/experience/target/activities": {
           "title": "Activities",
           "type": "array",
           "description": "A list of items representing executed activities.",