Repository: atlas Updated Branches: refs/heads/master 5614bf0d6 -> db77c65be
ATLAS-2314: Minor fixups to Model files Signed-off-by: Madhan Neethiraj <mad...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/db77c65b Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/db77c65b Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/db77c65b Branch: refs/heads/master Commit: db77c65becac07ed0674fa4e6bc050a846991718 Parents: 5614bf0 Author: David Radley <david_rad...@uk.ibm.com> Authored: Mon Dec 18 14:33:56 2017 +0000 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Thu Dec 21 01:28:46 2017 -0800 ---------------------------------------------------------------------- .../0100-Area1-Collaboration/0135-Meetings.json | 205 +++++++++++++++++++ .../0140-Communities.json | 4 +- .../0100-Area1-Collaboration/0150-Feedback.json | 26 ++- .../0390-GlossaryProjects.json | 17 ++ 4 files changed, 245 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/db77c65b/addons/models/0100-Area1-Collaboration/0135-Meetings.json ---------------------------------------------------------------------- diff --git a/addons/models/0100-Area1-Collaboration/0135-Meetings.json b/addons/models/0100-Area1-Collaboration/0135-Meetings.json new file mode 100644 index 0000000..59998be --- /dev/null +++ b/addons/models/0100-Area1-Collaboration/0135-Meetings.json @@ -0,0 +1,205 @@ +{ + "enumDefs": [ + { + "name": "ToDoStatus", + "description": "The status of the ToDo allows it to be tracked through to resolution.", + "typeVersion": "1.0", + "elementDefs": [ + { + "ordinal": 0, + "value": "OPEN", + "description": "An Open Todo means something needs to be done i.e. an action needs to be taken." + }, + { + "ordinal": 1, + "value": "IN_PROGRESS", + "description": "An in progress ToDo indicates it is being worked on." + }, + { + "ordinal": 2, + "value": "WAITING", + "description": "The ToDo is waiting / blocked on something." + }, + { + "ordinal": 3, + "value": "COMPLETE", + "description": "The work associated with the ToDo is complete." + }, + { + "ordinal": 99, + "value": "ABANDONED", + "description": "The ToDo is no longer required." + } + ] + } + ], + "structDefs": [], + "classificationDefs": [], + "entityDefs": [ + { + "name": "ToDo", + "description": "A Todo is a documented event, task, activity, or action that needs to take place.", + "superTypes": [ + "Referenceable" + ], + "typeVersion": "1.0", + "attributeDefs": [ + { + "name": "owner", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "description", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "creationTime", + "description":"The date and time that the ToDo was created", + "typeName": "date", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "completionTime", + "description":"The date and time that the ToDo was completed.", + "typeName": "date", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "toDoStatus", + "description": "The status indicates how far the ToDo is through to resolution.", + "typeName": "ToDoStatus", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + } + ] + }, + { + "name": "Meeting", + "description": "A meeting is a gathering (physically and/or virtually) of two or more participants that has been convened over a period of time, to achieve an objective through communication exchanges.", + "superTypes": [ + "Referenceable" + ], + "typeVersion": "1.0", + "attributeDefs": [ + { + "name": "title", + "description" : "Meeting title. A meaningful name for the meeting.", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "description", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "startTime", + "description":"The date and time that the Meeting started", + "typeName": "date", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "endTime", + "description":"The date and time that the Meeting ended.", + "typeName": "date", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "objective", + "description":"The intended outcome of the meeting.", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + }, + { + "name": "minutes", + "description":"The minutes of the meeting.", + "typeName": "string", + "cardinality": "SINGLE", + "isIndexable": true, + "isOptional": true, + "isUnique": false + } + ] + } + ], + "relationshipDefs": [ + { + "name": "ProjectMeeting", + "typeVersion": "1.0", + "endDef1": { + "name": "relatedProjects", + "type": "Meeting", + "cardinality": "SET" + }, + "endDef2": { + "name": "meetings", + "type": "Project", + "cardinality": "SET" + }, + "propagateTags": "NONE" + }, + { + "name": "MeetingOnReferencable", + "typeVersion": "1.0", + "endDef1": { + "name": "meetings", + "type": "Referenceable", + "cardinality": "SET" + }, + "endDef2": { + "name": "relatedReferenceables", + "type": "Meeting", + "cardinality": "SET" + }, + "propagateTags": "NONE", + "attributeDefs": [] + }, + { + "name": "ToDoOnReferencable", + "typeVersion": "1.0", + "endDef1": { + "name": "todos", + "type": "Referenceable", + "cardinality": "SET" + }, + "endDef2": { + "name": "relatedReferenceables", + "type": "ToDo", + "cardinality": "SET" + }, + "propagateTags": "NONE", + "attributeDefs": [] + } + ] +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/atlas/blob/db77c65b/addons/models/0100-Area1-Collaboration/0140-Communities.json ---------------------------------------------------------------------- diff --git a/addons/models/0100-Area1-Collaboration/0140-Communities.json b/addons/models/0100-Area1-Collaboration/0140-Communities.json index 20c835b..e6d7b86 100644 --- a/addons/models/0100-Area1-Collaboration/0140-Communities.json +++ b/addons/models/0100-Area1-Collaboration/0140-Communities.json @@ -70,15 +70,13 @@ "endDef1": { "name": "Community", "type": "Person", - "cardinality": "SET", - "isContainer": true + "cardinality": "SET" }, "endDef2": { "name": "members", "type": "Community", "cardinality": "SET" }, - "relationshipCategory": "AGGREGATION", "propagateTags": "NONE", "attributeDefs": [ { http://git-wip-us.apache.org/repos/asf/atlas/blob/db77c65b/addons/models/0100-Area1-Collaboration/0150-Feedback.json ---------------------------------------------------------------------- diff --git a/addons/models/0100-Area1-Collaboration/0150-Feedback.json b/addons/models/0100-Area1-Collaboration/0150-Feedback.json index a3a80c1..0115c64 100644 --- a/addons/models/0100-Area1-Collaboration/0150-Feedback.json +++ b/addons/models/0100-Area1-Collaboration/0150-Feedback.json @@ -209,7 +209,7 @@ "cardinality": "SINGLE" }, "propagateTags": "NONE", - "relationshipCategory": "COMPOSITION" + "relationshipCategory": "AGGREGATION" }, { "name": "AttachedTag", @@ -225,7 +225,7 @@ "type": "InformalTag", "cardinality": "SINGLE" }, - "relationshipCategory": "COMPOSITION", + "relationshipCategory": "AGGREGATION", "propagateTags": "NONE" }, { @@ -242,7 +242,7 @@ "type": "Rating", "cardinality": "SINGLE" }, - "relationshipCategory": "COMPOSITION", + "relationshipCategory": "AGGREGATION", "propagateTags": "NONE" }, { @@ -259,7 +259,7 @@ "type": "Collection", "cardinality": "SINGLE" }, - "relationshipCategory": "COMPOSITION", + "relationshipCategory": "AGGREGATION", "propagateTags": "NONE", "attributeDefs": [ { @@ -299,6 +299,24 @@ "isUnique": false } ] + }, + { + "name": "CommentReply", + "typeVersion": "1.0", + "endDef1": { + "name": "commentReplies", + "type": "Comment", + "cardinality": "SET", + "isContainer": true + }, + "endDef2": { + "name": "commentsOn", + "type": "Comment", + "cardinality": "SINGLE" + }, + "relationshipCategory": "AGGREGATION", + "propagateTags": "NONE", + "attributeDefs": [] } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/atlas/blob/db77c65b/addons/models/0300-Area3-SubjectArea/0390-GlossaryProjects.json ---------------------------------------------------------------------- diff --git a/addons/models/0300-Area3-SubjectArea/0390-GlossaryProjects.json b/addons/models/0300-Area3-SubjectArea/0390-GlossaryProjects.json new file mode 100644 index 0000000..fac8864 --- /dev/null +++ b/addons/models/0300-Area3-SubjectArea/0390-GlossaryProjects.json @@ -0,0 +1,17 @@ +{ + "enumDefs": [], + "structDefs": [], + "classificationDefs": [ + { + "name": "GlossaryProject", + "superTypes": [], + "description": "A glossary project is used to develop new elements for the glossary.", + "typeVersion": "1.0", + "entityTypes": [ + "Project" + ] + } + ], + "entityDefs": [], + "relationshipDefs": [] +}
