You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2018/01/11 16:29:54 UTC

atlas git commit: ATLAS-2341: amend the Area 1 models so the relationship names are unique

Repository: atlas
Updated Branches:
  refs/heads/master b17d0e970 -> a7f3e1ad3


ATLAS-2341: amend the Area 1 models so the relationship names are unique

Signed-off-by: Madhan Neethiraj <ma...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/a7f3e1ad
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/a7f3e1ad
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/a7f3e1ad

Branch: refs/heads/master
Commit: a7f3e1ad3c0a452a25ef886c7e259497147c3b2f
Parents: b17d0e9
Author: David Radley <da...@uk.ibm.com>
Authored: Mon Jan 8 18:06:01 2018 +0100
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu Jan 11 08:29:40 2018 -0800

----------------------------------------------------------------------
 .../0100-Area1-Collaboration/0135-Meetings.json |  2 +-
 .../0140-Communities.json                       |  4 +-
 .../0100-Area1-Collaboration/0150-Feedback.json | 50 +++-----------------
 3 files changed, 10 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/a7f3e1ad/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
index 59998be..3270159 100644
--- a/addons/models/0100-Area1-Collaboration/0135-Meetings.json
+++ b/addons/models/0100-Area1-Collaboration/0135-Meetings.json
@@ -163,7 +163,7 @@
         "cardinality": "SET"
       },
       "endDef2": {
-        "name": "meetings",
+        "name": "projectMeetings",
         "type": "Project",
         "cardinality": "SET"
       },

http://git-wip-us.apache.org/repos/asf/atlas/blob/a7f3e1ad/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 e6d7b86..9b01feb 100644
--- a/addons/models/0100-Area1-Collaboration/0140-Communities.json
+++ b/addons/models/0100-Area1-Collaboration/0140-Communities.json
@@ -80,7 +80,7 @@
       "propagateTags": "NONE",
       "attributeDefs": [
         {
-          "name": "relationshipType",
+          "name": "communityMembershipType",
           "typeName": "CommunityMembershipType",
           "cardinality": "SINGLE",
           "isIndexable": true,
@@ -93,7 +93,7 @@
       "name": "CommunityResources",
       "typeVersion": "1.0",
       "endDef1": {
-        "name": "supportingResources",
+        "name": "communityResources",
         "type": "Community",
         "cardinality": "SET",
         "isContainer": true

http://git-wip-us.apache.org/repos/asf/atlas/blob/a7f3e1ad/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 0115c64..e3a2a17 100644
--- a/addons/models/0100-Area1-Collaboration/0150-Feedback.json
+++ b/addons/models/0100-Area1-Collaboration/0150-Feedback.json
@@ -190,7 +190,8 @@
       "superTypes": [
         "InformalTag"
       ],
-      "typeVersion": "1.0"
+      "typeVersion": "1.0",
+      "attributeDefs": []
     }
   ],
   "relationshipDefs": [
@@ -249,56 +250,19 @@
       "name": "AttachedFeedback",
       "typeVersion": "1.0",
       "endDef1": {
-        "name": "supportingResources",
-        "type": "Project",
+        "name": "comments",
+        "type": "Referenceable",
         "cardinality": "SET",
         "isContainer": true
       },
       "endDef2": {
-        "name": "projectUse",
-        "type": "Collection",
+        "name": "commentsOn",
+        "type": "Comment",
         "cardinality": "SINGLE"
       },
       "relationshipCategory": "AGGREGATION",
       "propagateTags": "NONE",
-      "attributeDefs": [
-        {
-          "name": "resourceUse",
-          "description": "Role in the team.",
-          "typeName": "string",
-          "cardinality": "SINGLE",
-          "isIndexable": true,
-          "isOptional": true,
-          "isUnique": false
-        }
-      ]
-    },
-    {
-      "name": "ProjectScope",
-      "typeVersion": "1.0",
-      "endDef1": {
-        "name": "projectScope",
-        "type": "Project",
-        "cardinality": "SET",
-        "isContainer": true
-      },
-      "endDef2": {
-        "name": "projectImpactingAssets",
-        "type": "Collection",
-        "cardinality": "SINGLE"
-      },
-      "relationshipCategory": "COMPOSITION",
-      "propagateTags": "NONE",
-      "attributeDefs": [
-        {
-          "name": "scopeDescription",
-          "typeName": "string",
-          "cardinality": "SINGLE",
-          "isIndexable": true,
-          "isOptional": true,
-          "isUnique": false
-        }
-      ]
+      "attributeDefs": []
     },
     {
       "name": "CommentReply",