atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From david...@apache.org
Subject [2/2] atlas git commit: ATLAS-2045 Renumber shipped Atlas models
Date Thu, 17 Aug 2017 16:29:58 GMT
ATLAS-2045 Renumber shipped Atlas models

Signed-off-by: David Radley <david_radley@uk.ibm.com>


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

Branch: refs/heads/master
Commit: 63ed2a5dac174d0fc241e9ae2d8dc5b97408c826
Parents: 56374ff
Author: David Radley <david_radley@uk.ibm.com>
Authored: Tue Aug 15 14:45:43 2017 +0100
Committer: David Radley <david_radley@uk.ibm.com>
Committed: Thu Aug 17 17:29:44 2017 +0100

----------------------------------------------------------------------
 addons/models/0020-fs_model.json                | 191 ------
 addons/models/0030-hive_model.json              | 625 -------------------
 addons/models/0040-sqoop_model.json             |  97 ---
 addons/models/0050-falcon_model.json            | 206 ------
 addons/models/0060-hbase_model.json             | 142 -----
 addons/models/0070-kafka_model.json             |  57 --
 addons/models/0080-storm_model.json             | 167 -----
 addons/models/1020-fs_model.json                | 191 ++++++
 addons/models/1030-hive_model.json              | 625 +++++++++++++++++++
 addons/models/1040-sqoop_model.json             |  97 +++
 addons/models/1050-falcon_model.json            | 206 ++++++
 addons/models/1060-hbase_model.json             | 142 +++++
 addons/models/1070-kafka_model.json             |  57 ++
 addons/models/1080-storm_model.json             | 167 +++++
 .../repository/impexp/ImportServiceTest.java    |   2 +-
 15 files changed, 1486 insertions(+), 1486 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/0020-fs_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0020-fs_model.json b/addons/models/0020-fs_model.json
deleted file mode 100644
index ff17261..0000000
--- a/addons/models/0020-fs_model.json
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-    "enumDefs": [
-        {
-            "name": "file_action",
-            "typeVersion": "1.0",
-            "elementDefs": [
-                {
-                    "ordinal": 0,
-                    "value": "NONE"
-                },
-                {
-                    "ordinal": 1,
-                    "value": "EXECUTE"
-                },
-                {
-                    "ordinal": 2,
-                    "value": "WRITE"
-                },
-                {
-                    "ordinal": 3,
-                    "value": "WRITE_EXECUTE"
-                },
-                {
-                    "ordinal": 4,
-                    "value": "READ"
-                },
-                {
-                    "ordinal": 5,
-                    "value": "READ_EXECUTE"
-                },
-                {
-                    "ordinal": 6,
-                    "value": "READ_WRITE"
-                },
-                {
-                    "ordinal": 7,
-                    "value": "ALL"
-                }
-            ]
-        }
-    ],
-    "structDefs": [
-        {
-            "name": "fs_permissions",
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "group",
-                    "typeName": "file_action",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "user",
-                    "typeName": "file_action",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "sticky",
-                    "typeName": "boolean",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "others",
-                    "typeName": "file_action",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                }
-            ]
-        }
-    ],
-    "classificationDefs": [],
-    "entityDefs": [
-        {
-            "name": "fs_path",
-            "superTypes": [
-                "DataSet"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "path",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "createTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "modifiedTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "isFile",
-                    "typeName": "boolean",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "isSymlink",
-                    "typeName": "boolean",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "fileSize",
-                    "typeName": "long",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "group",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "posixPermissions",
-                    "typeName": "fs_permissions",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "hdfs_path",
-            "superTypes": [
-                "fs_path"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "clusterName",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "numberOfReplicas",
-                    "typeName": "int",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "extendedAttributes",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/0030-hive_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0030-hive_model.json b/addons/models/0030-hive_model.json
deleted file mode 100644
index f47a7b9..0000000
--- a/addons/models/0030-hive_model.json
+++ /dev/null
@@ -1,625 +0,0 @@
-{
-    "enumDefs": [
-        {
-            "name": "hive_principal_type",
-            "typeVersion": "1.0",
-            "elementDefs": [
-                {
-                    "ordinal": 1,
-                    "value": "USER"
-                },
-                {
-                    "ordinal": 2,
-                    "value": "ROLE"
-                },
-                {
-                    "ordinal": 3,
-                    "value": "GROUP"
-                }
-            ]
-        }
-    ],
-    "structDefs": [
-        {
-            "name": "hive_order",
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "order",
-                    "typeName": "int",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "col",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "hive_serde",
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "name",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "serializationLib",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "parameters",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        }
-    ],
-    "classificationDefs": [],
-    "entityDefs": [
-        {
-            "name": "hive_process",
-            "superTypes": [
-                "Process"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "startTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "endTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "userName",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "operationType",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "queryText",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "queryPlan",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "queryId",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "recentQueries",
-                    "typeName": "array<string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "clusterName",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "queryGraph",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "hive_table",
-            "superTypes": [
-                "DataSet"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "db",
-                    "typeName": "hive_db",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "createTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "lastAccessTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "comment",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "retention",
-                    "typeName": "int",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "sd",
-                    "typeName": "hive_storagedesc",
-                    "cardinality": "SINGLE",
-                    "constraints": [
-                        {
-                            "type": "ownedRef"
-                        }
-                    ],
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "partitionKeys",
-                    "typeName": "array<hive_column>",
-                    "cardinality": "SINGLE",
-                    "constraints": [
-                        {
-                            "type": "ownedRef"
-                        }
-                    ],
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "aliases",
-                    "typeName": "array<string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "columns",
-                    "typeName": "array<hive_column>",
-                    "cardinality": "SINGLE",
-                    "constraints": [
-                        {
-                            "type": "ownedRef"
-                        }
-                    ],
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "parameters",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "viewOriginalText",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "viewExpandedText",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "tableType",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "temporary",
-                    "typeName": "boolean",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "hive_storagedesc",
-            "superTypes": [
-                "Referenceable"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "table",
-                    "typeName": "hive_table",
-                    "cardinality": "SINGLE",
-                    "constraints": [
-                        {
-                            "type": "inverseRef",
-                            "params": {
-                                "attribute": "sd"
-                            }
-                        }
-                    ],
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "location",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "inputFormat",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "outputFormat",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "compressed",
-                    "typeName": "boolean",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "numBuckets",
-                    "typeName": "int",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "serdeInfo",
-                    "typeName": "hive_serde",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "bucketCols",
-                    "typeName": "array<string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "sortCols",
-                    "typeName": "array<hive_order>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "parameters",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "storedAsSubDirectories",
-                    "typeName": "boolean",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "hive_db",
-            "superTypes": [
-                "Referenceable",
-                "Asset"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "clusterName",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "location",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "parameters",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "ownerType",
-                    "typeName": "hive_principal_type",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "hive_column",
-            "superTypes": [
-                "DataSet"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "type",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "comment",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "table",
-                    "typeName": "hive_table",
-                    "cardinality": "SINGLE",
-                    "constraints": [
-                        {
-                            "type": "inverseRef",
-                            "params": {
-                                "attribute": "columns"
-                            }
-                        }
-                    ],
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name" : "hive_column_lineage",
-            "superTypes" : [
-                "Process"
-            ],
-            "typeVersion" : "1.0",
-            "attributeDefs" : [
-                {
-                    "name": "query",
-                    "typeName": "hive_process",
-                    "cardinality" : "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "depenendencyType",
-                    "typeName": "string",
-                    "cardinality" : "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "expression",
-                    "typeName": "string",
-                    "cardinality" : "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        }
-    ],
-    "relationshipDefs": [
-        {
-            "name": "hive_db_tables",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "hive_db",
-                "name": "tables",
-                "isContainer": true,
-                "cardinality": "SET"
-            },
-            "endDef2": {
-                "type": "hive_table",
-                "name": "db",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "ONE_TO_TWO"
-        },
-        {
-            "name": "hive_table_columns",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "hive_table",
-                "name": "columns",
-                "isContainer": true,
-                "cardinality": "SET",
-                "isLegacyAttribute": true
-            },
-            "endDef2": {
-                "type": "hive_column",
-                "name": "table",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "ONE_TO_TWO"
-        },
-        {
-            "name": "hive_table_partitionkeys",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "hive_table",
-                "name": "partitionKeys",
-                "isContainer": true,
-                "cardinality": "SET",
-                "isLegacyAttribute": true
-            },
-            "endDef2": {
-                "type": "hive_column",
-                "name": "table",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "ONE_TO_TWO"
-        },
-        {
-            "name": "hive_table_storagedesc",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "hive_table",
-                "name": "sd",
-                "isContainer": true,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "endDef2": {
-                "type": "hive_storagedesc",
-                "name": "table",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "ONE_TO_TWO"
-        },
-        {
-            "name": "hive_process_column_lineage",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "hive_process",
-                "name": "columnLineages",
-                "isContainer": true,
-                "cardinality": "SET"
-            },
-            "endDef2": {
-                "type": "hive_column_lineage",
-                "name": "query",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "NONE"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/0040-sqoop_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0040-sqoop_model.json b/addons/models/0040-sqoop_model.json
deleted file mode 100644
index f5c7fd9..0000000
--- a/addons/models/0040-sqoop_model.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "enumDefs": [],
-    "structDefs": [],
-    "classificationDefs": [],
-    "entityDefs": [
-        {
-            "name": "sqoop_process",
-            "superTypes": [
-                "Process"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "operation",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "commandlineOpts",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "startTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "endTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "userName",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "sqoop_dbdatastore",
-            "superTypes": [
-                "DataSet"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "dbStoreType",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "storeUse",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "storeUri",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "source",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/0050-falcon_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0050-falcon_model.json b/addons/models/0050-falcon_model.json
deleted file mode 100644
index 4fa4604..0000000
--- a/addons/models/0050-falcon_model.json
+++ /dev/null
@@ -1,206 +0,0 @@
-{
-    "enumDefs": [],
-    "structDefs": [],
-    "classificationDefs": [],
-    "entityDefs": [
-        {
-            "name": "falcon_feed_replication",
-            "superTypes": [
-                "Process"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": []
-        },
-        {
-            "name": "falcon_cluster",
-            "superTypes": [
-                "Infrastructure"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "colo",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "tags",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "falcon_feed",
-            "superTypes": [
-                "DataSet"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "frequency",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "stored-in",
-                    "typeName": "falcon_cluster",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "groups",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "tags",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "falcon_process",
-            "superTypes": [
-                "Process"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "frequency",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "runs-on",
-                    "typeName": "falcon_cluster",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "tags",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "pipelines",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "workflow-properties",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "falcon_feed_creation",
-            "superTypes": [
-                "Process"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "stored-in",
-                    "typeName": "falcon_cluster",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                }
-            ]
-        }
-    ],
-    "relationshipDefs": [
-        {
-            "name": "falcon_feed_cluster",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "falcon_feed",
-                "name": "stored-in",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "endDef2": {
-                "type": "falcon_cluster",
-                "name": "feeds",
-                "isContainer": true,
-                "cardinality": "SET"
-            },
-            "propagateTags": "NONE"
-        },
-        {
-            "name": "falcon_cluster_process",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "falcon_cluster",
-                "name": "processes",
-                "isContainer": true,
-                "cardinality": "SET"
-            },
-            "endDef2": {
-                "type": "falcon_process",
-                "name": "runs-on",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "NONE"
-        },
-        {
-            "name": "falcon_cluster_feed_creation",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "falcon_cluster",
-                "name": "feedCreations",
-                "isContainer": true,
-                "cardinality": "SET"
-            },
-            "endDef2": {
-                "type": "falcon_feed_creation",
-                "name": "stored-in",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "NONE"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/0060-hbase_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0060-hbase_model.json b/addons/models/0060-hbase_model.json
deleted file mode 100644
index 3e46e06..0000000
--- a/addons/models/0060-hbase_model.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-    "enumDefs": [],
-    "structDefs": [],
-    "classificationDefs": [],
-    "entityDefs": [
-        {
-            "name": "hbase_table",
-            "superTypes": [
-                "DataSet"
-            ],
-            "typeVersion": "1.1",
-            "attributeDefs": [
-                {
-                    "name": "uri",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "column_families",
-                    "typeName": "array<hbase_column_family>",
-                    "cardinality": "SINGLE",
-                    "constraints": [
-                        {
-                            "type": "ownedRef"
-                        }
-                    ],
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "hbase_column_family",
-            "superTypes": [
-                "DataSet"
-            ],
-            "attributeDefs": [
-                {
-                    "name": "table",
-                    "typeName": "hbase_table",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false,
-                    "constraints": [
-                        {
-                            "type": "inverseRef",
-                            "params": {
-                                "attribute": "column_families"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "name": "columns",
-                    "typeName": "array<hbase_column>",
-                    "cardinality": "SINGLE",
-                    "constraints": [
-                        {
-                            "type": "ownedRef"
-                        }
-                    ],
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ],
-            "typeVersion": "1.0"
-        },
-        {
-            "name": "hbase_column",
-            "superTypes": [
-                "DataSet"
-            ],
-            "attributeDefs": [
-                {
-                    "name": "column_family",
-                    "typeName": "hbase_column_family",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false,
-                    "constraints": [
-                        {
-                            "type": "inverseRef",
-                            "params": {
-                                "attribute": "columns"
-                            }
-                        }
-                    ]
-                }
-            ],
-            "typeVersion": "1.0"
-        }
-    ],
-    "relationshipDefs": [
-        {
-            "name": "hbase_table_column_families",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "hbase_table",
-                "name": "column_families",
-                "isContainer": true,
-                "cardinality": "SET",
-                "isLegacyAttribute": true
-            },
-            "endDef2": {
-                "type": "hbase_column_family",
-                "name": "table",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "ONE_TO_TWO"
-        },
-        {
-            "name": "hbase_column_family_columns",
-            "typeVersion": "1.0",
-            "relationshipCategory": "COMPOSITION",
-            "endDef1": {
-                "type": "hbase_column_family",
-                "name": "columns",
-                "isContainer": true,
-                "cardinality": "SET",
-                "isLegacyAttribute": true
-            },
-            "endDef2": {
-                "type": "hbase_column",
-                "name": "column_family",
-                "isContainer": false,
-                "cardinality": "SINGLE",
-                "isLegacyAttribute": true
-            },
-            "propagateTags": "ONE_TO_TWO"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/0070-kafka_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0070-kafka_model.json b/addons/models/0070-kafka_model.json
deleted file mode 100644
index b7f6e33..0000000
--- a/addons/models/0070-kafka_model.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "enumDefs": [],
-    "structDefs": [],
-    "classificationDefs": [],
-    "entityDefs": [
-        {
-            "name": "kafka_topic",
-            "superTypes": [
-                "DataSet"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "topic",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": true
-                },
-                {
-                    "name": "uri",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "jms_topic",
-            "superTypes": [
-                "DataSet"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "topic",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": true
-                },
-                {
-                    "name": "uri",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                }
-            ]
-        }
-    ]
-}

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/0080-storm_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0080-storm_model.json b/addons/models/0080-storm_model.json
deleted file mode 100644
index b008c7a..0000000
--- a/addons/models/0080-storm_model.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-    "enumDefs": [],
-    "structDefs": [],
-    "classificationDefs": [],
-    "entityDefs": [
-        {
-            "name": "storm_topology",
-            "superTypes": [
-                "Process"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "id",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": true
-                },
-                {
-                    "name": "startTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "endTime",
-                    "typeName": "date",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "conf",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "clusterName",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "nodes",
-                    "typeName": "array<storm_node>",
-                    "cardinality": "LIST",
-                    "constraints": [],
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "storm_node",
-            "superTypes": [],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "name",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "description",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": true,
-                    "isUnique": false
-                },
-                {
-                    "name": "driverClass",
-                    "typeName": "string",
-                    "cardinality": "SINGLE",
-                    "isIndexable": true,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "conf",
-                    "typeName": "map<string,string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "storm_spout",
-            "superTypes": [
-                "storm_node"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "outputs",
-                    "typeName": "array<string>",
-                    "cardinality": "LIST",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                }
-            ]
-        },
-        {
-            "name": "storm_bolt",
-            "superTypes": [
-                "storm_node"
-            ],
-            "typeVersion": "1.0",
-            "attributeDefs": [
-                {
-                    "name": "inputs",
-                    "typeName": "array<string>",
-                    "cardinality": "LIST",
-                    "isIndexable": false,
-                    "isOptional": false,
-                    "isUnique": false
-                },
-                {
-                    "name": "outputs",
-                    "typeName": "array<string>",
-                    "cardinality": "SINGLE",
-                    "isIndexable": false,
-                    "isOptional": true,
-                    "isUnique": false
-                }
-            ]
-        }
-    ],
-    "relationshipDefs": [
-        {
-            "name": "storm_topology_nodes",
-            "typeVersion": "1.0",
-            "relationshipCategory": "ASSOCIATION",
-            "endDef1": {
-                "type": "storm_topology",
-                "name": "nodes",
-                "isContainer": false,
-                "cardinality": "SET",
-                "isLegacyAttribute": true
-            },
-            "endDef2": {
-                "type": "storm_node",
-                "name": "topolgies",
-                "isContainer": false,
-                "cardinality": "SET"
-            },
-            "propagateTags": "NONE"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/1020-fs_model.json
----------------------------------------------------------------------
diff --git a/addons/models/1020-fs_model.json b/addons/models/1020-fs_model.json
new file mode 100644
index 0000000..ff17261
--- /dev/null
+++ b/addons/models/1020-fs_model.json
@@ -0,0 +1,191 @@
+{
+    "enumDefs": [
+        {
+            "name": "file_action",
+            "typeVersion": "1.0",
+            "elementDefs": [
+                {
+                    "ordinal": 0,
+                    "value": "NONE"
+                },
+                {
+                    "ordinal": 1,
+                    "value": "EXECUTE"
+                },
+                {
+                    "ordinal": 2,
+                    "value": "WRITE"
+                },
+                {
+                    "ordinal": 3,
+                    "value": "WRITE_EXECUTE"
+                },
+                {
+                    "ordinal": 4,
+                    "value": "READ"
+                },
+                {
+                    "ordinal": 5,
+                    "value": "READ_EXECUTE"
+                },
+                {
+                    "ordinal": 6,
+                    "value": "READ_WRITE"
+                },
+                {
+                    "ordinal": 7,
+                    "value": "ALL"
+                }
+            ]
+        }
+    ],
+    "structDefs": [
+        {
+            "name": "fs_permissions",
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "group",
+                    "typeName": "file_action",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "user",
+                    "typeName": "file_action",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "sticky",
+                    "typeName": "boolean",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "others",
+                    "typeName": "file_action",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                }
+            ]
+        }
+    ],
+    "classificationDefs": [],
+    "entityDefs": [
+        {
+            "name": "fs_path",
+            "superTypes": [
+                "DataSet"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "path",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "createTime",
+                    "typeName": "date",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "modifiedTime",
+                    "typeName": "date",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "isFile",
+                    "typeName": "boolean",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "isSymlink",
+                    "typeName": "boolean",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "fileSize",
+                    "typeName": "long",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "group",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "posixPermissions",
+                    "typeName": "fs_permissions",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        },
+        {
+            "name": "hdfs_path",
+            "superTypes": [
+                "fs_path"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "clusterName",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "numberOfReplicas",
+                    "typeName": "int",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "extendedAttributes",
+                    "typeName": "map<string,string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        }
+    ]
+}

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/1030-hive_model.json
----------------------------------------------------------------------
diff --git a/addons/models/1030-hive_model.json b/addons/models/1030-hive_model.json
new file mode 100644
index 0000000..f47a7b9
--- /dev/null
+++ b/addons/models/1030-hive_model.json
@@ -0,0 +1,625 @@
+{
+    "enumDefs": [
+        {
+            "name": "hive_principal_type",
+            "typeVersion": "1.0",
+            "elementDefs": [
+                {
+                    "ordinal": 1,
+                    "value": "USER"
+                },
+                {
+                    "ordinal": 2,
+                    "value": "ROLE"
+                },
+                {
+                    "ordinal": 3,
+                    "value": "GROUP"
+                }
+            ]
+        }
+    ],
+    "structDefs": [
+        {
+            "name": "hive_order",
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "order",
+                    "typeName": "int",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "col",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                }
+            ]
+        },
+        {
+            "name": "hive_serde",
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "name",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "serializationLib",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "parameters",
+                    "typeName": "map<string,string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        }
+    ],
+    "classificationDefs": [],
+    "entityDefs": [
+        {
+            "name": "hive_process",
+            "superTypes": [
+                "Process"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "startTime",
+                    "typeName": "date",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "endTime",
+                    "typeName": "date",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "userName",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "operationType",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "queryText",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "queryPlan",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "queryId",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "recentQueries",
+                    "typeName": "array<string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "clusterName",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "queryGraph",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        },
+        {
+            "name": "hive_table",
+            "superTypes": [
+                "DataSet"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "db",
+                    "typeName": "hive_db",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "createTime",
+                    "typeName": "date",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "lastAccessTime",
+                    "typeName": "date",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "comment",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "retention",
+                    "typeName": "int",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "sd",
+                    "typeName": "hive_storagedesc",
+                    "cardinality": "SINGLE",
+                    "constraints": [
+                        {
+                            "type": "ownedRef"
+                        }
+                    ],
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "partitionKeys",
+                    "typeName": "array<hive_column>",
+                    "cardinality": "SINGLE",
+                    "constraints": [
+                        {
+                            "type": "ownedRef"
+                        }
+                    ],
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "aliases",
+                    "typeName": "array<string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "columns",
+                    "typeName": "array<hive_column>",
+                    "cardinality": "SINGLE",
+                    "constraints": [
+                        {
+                            "type": "ownedRef"
+                        }
+                    ],
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "parameters",
+                    "typeName": "map<string,string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "viewOriginalText",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "viewExpandedText",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "tableType",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "temporary",
+                    "typeName": "boolean",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        },
+        {
+            "name": "hive_storagedesc",
+            "superTypes": [
+                "Referenceable"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "table",
+                    "typeName": "hive_table",
+                    "cardinality": "SINGLE",
+                    "constraints": [
+                        {
+                            "type": "inverseRef",
+                            "params": {
+                                "attribute": "sd"
+                            }
+                        }
+                    ],
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "location",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "inputFormat",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "outputFormat",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "compressed",
+                    "typeName": "boolean",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "numBuckets",
+                    "typeName": "int",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "serdeInfo",
+                    "typeName": "hive_serde",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "bucketCols",
+                    "typeName": "array<string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "sortCols",
+                    "typeName": "array<hive_order>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "parameters",
+                    "typeName": "map<string,string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "storedAsSubDirectories",
+                    "typeName": "boolean",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        },
+        {
+            "name": "hive_db",
+            "superTypes": [
+                "Referenceable",
+                "Asset"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "clusterName",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "location",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "parameters",
+                    "typeName": "map<string,string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "ownerType",
+                    "typeName": "hive_principal_type",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        },
+        {
+            "name": "hive_column",
+            "superTypes": [
+                "DataSet"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "type",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "comment",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                },
+                {
+                    "name": "table",
+                    "typeName": "hive_table",
+                    "cardinality": "SINGLE",
+                    "constraints": [
+                        {
+                            "type": "inverseRef",
+                            "params": {
+                                "attribute": "columns"
+                            }
+                        }
+                    ],
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        },
+        {
+            "name" : "hive_column_lineage",
+            "superTypes" : [
+                "Process"
+            ],
+            "typeVersion" : "1.0",
+            "attributeDefs" : [
+                {
+                    "name": "query",
+                    "typeName": "hive_process",
+                    "cardinality" : "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "depenendencyType",
+                    "typeName": "string",
+                    "cardinality" : "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "expression",
+                    "typeName": "string",
+                    "cardinality" : "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        }
+    ],
+    "relationshipDefs": [
+        {
+            "name": "hive_db_tables",
+            "typeVersion": "1.0",
+            "relationshipCategory": "COMPOSITION",
+            "endDef1": {
+                "type": "hive_db",
+                "name": "tables",
+                "isContainer": true,
+                "cardinality": "SET"
+            },
+            "endDef2": {
+                "type": "hive_table",
+                "name": "db",
+                "isContainer": false,
+                "cardinality": "SINGLE",
+                "isLegacyAttribute": true
+            },
+            "propagateTags": "ONE_TO_TWO"
+        },
+        {
+            "name": "hive_table_columns",
+            "typeVersion": "1.0",
+            "relationshipCategory": "COMPOSITION",
+            "endDef1": {
+                "type": "hive_table",
+                "name": "columns",
+                "isContainer": true,
+                "cardinality": "SET",
+                "isLegacyAttribute": true
+            },
+            "endDef2": {
+                "type": "hive_column",
+                "name": "table",
+                "isContainer": false,
+                "cardinality": "SINGLE",
+                "isLegacyAttribute": true
+            },
+            "propagateTags": "ONE_TO_TWO"
+        },
+        {
+            "name": "hive_table_partitionkeys",
+            "typeVersion": "1.0",
+            "relationshipCategory": "COMPOSITION",
+            "endDef1": {
+                "type": "hive_table",
+                "name": "partitionKeys",
+                "isContainer": true,
+                "cardinality": "SET",
+                "isLegacyAttribute": true
+            },
+            "endDef2": {
+                "type": "hive_column",
+                "name": "table",
+                "isContainer": false,
+                "cardinality": "SINGLE",
+                "isLegacyAttribute": true
+            },
+            "propagateTags": "ONE_TO_TWO"
+        },
+        {
+            "name": "hive_table_storagedesc",
+            "typeVersion": "1.0",
+            "relationshipCategory": "COMPOSITION",
+            "endDef1": {
+                "type": "hive_table",
+                "name": "sd",
+                "isContainer": true,
+                "cardinality": "SINGLE",
+                "isLegacyAttribute": true
+            },
+            "endDef2": {
+                "type": "hive_storagedesc",
+                "name": "table",
+                "isContainer": false,
+                "cardinality": "SINGLE",
+                "isLegacyAttribute": true
+            },
+            "propagateTags": "ONE_TO_TWO"
+        },
+        {
+            "name": "hive_process_column_lineage",
+            "typeVersion": "1.0",
+            "relationshipCategory": "COMPOSITION",
+            "endDef1": {
+                "type": "hive_process",
+                "name": "columnLineages",
+                "isContainer": true,
+                "cardinality": "SET"
+            },
+            "endDef2": {
+                "type": "hive_column_lineage",
+                "name": "query",
+                "isContainer": false,
+                "cardinality": "SINGLE",
+                "isLegacyAttribute": true
+            },
+            "propagateTags": "NONE"
+        }
+    ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/atlas/blob/63ed2a5d/addons/models/1040-sqoop_model.json
----------------------------------------------------------------------
diff --git a/addons/models/1040-sqoop_model.json b/addons/models/1040-sqoop_model.json
new file mode 100644
index 0000000..f5c7fd9
--- /dev/null
+++ b/addons/models/1040-sqoop_model.json
@@ -0,0 +1,97 @@
+{
+    "enumDefs": [],
+    "structDefs": [],
+    "classificationDefs": [],
+    "entityDefs": [
+        {
+            "name": "sqoop_process",
+            "superTypes": [
+                "Process"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "operation",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "commandlineOpts",
+                    "typeName": "map<string,string>",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "startTime",
+                    "typeName": "date",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "endTime",
+                    "typeName": "date",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "userName",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        },
+        {
+            "name": "sqoop_dbdatastore",
+            "superTypes": [
+                "DataSet"
+            ],
+            "typeVersion": "1.0",
+            "attributeDefs": [
+                {
+                    "name": "dbStoreType",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "storeUse",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "storeUri",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": false,
+                    "isOptional": false,
+                    "isUnique": false
+                },
+                {
+                    "name": "source",
+                    "typeName": "string",
+                    "cardinality": "SINGLE",
+                    "isIndexable": true,
+                    "isOptional": true,
+                    "isUnique": false
+                }
+            ]
+        }
+    ]
+}


Mime
View raw message