Merge branch 'master' into feature-odf
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/22780b93 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/22780b93 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/22780b93 Branch: refs/heads/feature-odf Commit: 22780b933f88e50bff1915029fa7aa18d2a14960 Parents: cac4bee 7fb09b0 Author: Madhan Neethiraj <mad...@apache.org> Authored: Mon Jul 24 08:56:38 2017 -0700 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Mon Jul 24 08:56:38 2017 -0700 ---------------------------------------------------------------------- DISCLAIMER.txt | 19 +- README.txt | 14 +- addons/falcon-bridge-shim/pom.xml | 2 +- addons/falcon-bridge/pom.xml | 2 +- addons/hdfs-model/pom.xml | 2 +- addons/hive-bridge-shim/pom.xml | 2 +- addons/hive-bridge/pom.xml | 2 +- addons/models/0010-base_model.json | 42 +- addons/models/0030-hive_model.json | 102 +++- addons/models/0050-falcon_model.json | 61 +- addons/models/0060-hbase_model.json | 44 +- addons/models/0080-storm_model.json | 23 +- addons/sqoop-bridge-shim/pom.xml | 2 +- addons/sqoop-bridge/pom.xml | 2 +- addons/storm-bridge-shim/pom.xml | 2 +- addons/storm-bridge/pom.xml | 2 +- authorization/pom.xml | 2 +- build-tools/pom.xml | 2 +- catalog/pom.xml | 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- .../org/apache/atlas/repository/Constants.java | 4 +- .../java/org/apache/atlas/utils/MD5Utils.java | 66 -- .../org/apache/atlas/utils/SHA256Utils.java | 68 +++ dashboardv2/gruntfile.js | 3 + dashboardv2/package.json | 57 +- dashboardv2/pom.xml | 4 +- dashboardv2/public/css/scss/main.scss | 2 +- dashboardv2/public/css/scss/override.scss | 22 +- dashboardv2/public/css/scss/tag.scss | 40 +- dashboardv2/public/index.html | 1 + dashboardv2/public/js/collection/VSearchList.js | 3 +- dashboardv2/public/js/main.js | 4 + dashboardv2/public/js/modules/Modal.js | 11 +- dashboardv2/public/js/router/Router.js | 48 +- .../business_catalog/BusinessCatalogHeader.html | 2 +- .../public/js/templates/common/modal.html | 7 +- .../search/AdvancedSearchInfo_tmpl.html | 2 +- .../templates/search/SearchLayoutView_tmpl.html | 4 +- .../search/SearchResultLayoutView_tmpl.html | 15 - .../public/js/templates/site/header.html | 2 +- .../public/js/utils/CommonViewFunction.js | 87 ++- dashboardv2/public/js/utils/TableLayout.js | 43 +- dashboardv2/public/js/utils/Utils.js | 17 +- .../js/views/audit/AuditTableLayoutView.js | 4 +- .../views/audit/CreateAuditTableLayoutView.js | 4 +- .../views/business_catalog/SideNavLayoutView.js | 6 +- .../views/detail_page/DetailPageLayoutView.js | 9 +- .../views/entity/EntityDetailTableLayoutView.js | 11 +- .../public/js/views/search/QueryBuilderView.js | 25 +- .../js/views/search/SearchDetailLayoutView.js | 3 +- .../public/js/views/search/SearchLayoutView.js | 257 ++++---- .../public/js/views/search/SearchQueryView.js | 21 +- .../js/views/search/SearchResultLayoutView.js | 207 +++++-- .../js/views/tag/TagDetailTableLayoutView.js | 31 +- .../public/js/views/tag/TagLayoutView.js | 4 +- .../public/js/views/tag/addTagModalView.js | 13 +- distro/pom.xml | 2 +- distro/src/bin/atlas_stop.py | 27 +- distro/src/conf/atlas-application.properties | 9 +- docs/pom.xml | 8 +- docs/src/site/site.xml | 14 +- docs/src/site/twiki/Import-API-Options.twiki | 22 + docs/src/site/twiki/Import-API.twiki | 6 +- docs/src/site/twiki/InstallationSteps.twiki | 2 +- docs/src/site/twiki/index.twiki | 8 - graphdb/api/pom.xml | 2 +- graphdb/common/pom.xml | 2 +- graphdb/graphdb-impls/pom.xml | 2 +- graphdb/pom.xml | 2 +- graphdb/titan0/pom.xml | 2 +- graphdb/titan1/pom.xml | 2 +- intg/pom.xml | 2 +- .../java/org/apache/atlas/AtlasErrorCode.java | 8 +- .../model/discovery/AtlasSearchResult.java | 78 ++- .../atlas/model/discovery/SearchParameters.java | 34 +- .../atlas/model/impexp/AtlasImportRequest.java | 18 +- .../atlas/model/instance/AtlasEntity.java | 38 +- .../atlas/model/instance/AtlasRelationship.java | 21 +- .../atlas/model/instance/AtlasStruct.java | 2 +- .../model/typedef/AtlasRelationshipDef.java | 2 + .../model/typedef/AtlasRelationshipEndDef.java | 25 +- .../atlas/type/AtlasClassificationType.java | 30 +- .../org/apache/atlas/type/AtlasEntityType.java | 125 +++- .../atlas/type/AtlasRelationshipType.java | 82 ++- .../org/apache/atlas/type/AtlasStructType.java | 126 +++- .../java/org/apache/atlas/type/AtlasType.java | 3 + .../apache/atlas/type/AtlasTypeRegistry.java | 4 + .../apache/atlas/TestRelationshipUtilsV2.java | 267 ++++++++ .../test/java/org/apache/atlas/TestUtilsV2.java | 1 - notification/pom.xml | 2 +- .../apache/atlas/kafka/AtlasKafkaConsumer.java | 16 +- .../apache/atlas/kafka/KafkaNotification.java | 12 +- .../notification/NotificationConsumer.java | 8 + .../apache/atlas/kafka/KafkaConsumerTest.java | 16 +- .../atlas/kafka/KafkaNotificationTest.java | 2 +- .../AbstractNotificationConsumerTest.java | 11 +- plugin-classloader/pom.xml | 2 +- pom.xml | 418 +++++++------ repository/pom.xml | 2 +- .../atlas/discovery/AtlasDiscoveryService.java | 2 +- .../ClassificationSearchProcessor.java | 211 +++++++ .../atlas/discovery/EntityDiscoveryService.java | 170 ++++-- .../atlas/discovery/EntitySearchProcessor.java | 232 +++++++ .../discovery/FullTextSearchProcessor.java | 168 +++++ .../org/apache/atlas/discovery/GremlinStep.java | 389 ------------ .../apache/atlas/discovery/SearchContext.java | 130 ++++ .../apache/atlas/discovery/SearchPipeline.java | 611 ------------------- .../apache/atlas/discovery/SearchProcessor.java | 398 ++++++++++++ .../org/apache/atlas/discovery/SolrStep.java | 288 --------- .../atlas/repository/graph/GraphHelper.java | 141 ++++- .../graph/TypedInstanceToGraphMapper.java | 4 +- .../atlas/repository/impexp/ExportService.java | 26 +- .../atlas/repository/impexp/ImportService.java | 2 +- .../apache/atlas/repository/impexp/ZipSink.java | 21 + .../atlas/repository/impexp/ZipSource.java | 2 +- .../bootstrap/AtlasTypeDefStoreInitializer.java | 23 + .../store/graph/AtlasRelationshipStore.java | 7 + .../store/graph/AtlasTypeDefGraphStore.java | 17 + .../graph/v1/AtlasEntityGraphDiscoveryV1.java | 18 +- .../store/graph/v1/AtlasEntityStoreV1.java | 119 +++- .../store/graph/v1/AtlasGraphUtilsV1.java | 10 +- .../graph/v1/AtlasRelationshipDefStoreV1.java | 7 +- .../graph/v1/AtlasRelationshipStoreV1.java | 234 ++++--- .../store/graph/v1/DeleteHandlerV1.java | 33 +- .../store/graph/v1/EntityGraphMapper.java | 446 ++++++++++++-- .../store/graph/v1/EntityGraphRetriever.java | 171 +++++- .../org/apache/atlas/util/SearchTracker.java | 16 +- .../test/java/org/apache/atlas/TestModules.java | 3 - .../ReverseReferenceUpdateSoftDeleteTest.java | 1 + .../repository/impexp/ImportServiceTest.java | 25 +- .../impexp/ZipFileResourceTestUtils.java | 3 + .../atlas/repository/impexp/ZipSinkTest.java | 79 ++- .../AtlasRelationshipStoreHardDeleteV1Test.java | 54 ++ .../AtlasRelationshipStoreSoftDeleteV1Test.java | 55 ++ .../graph/v1/AtlasRelationshipStoreV1Test.java | 496 +++++++++++++++ .../services/EntityDiscoveryServiceTest.java | 12 +- repository/src/test/resources/ctas.zip | Bin 0 -> 7674 bytes server-api/pom.xml | 2 +- shaded/hbase-client-shaded/pom.xml | 2 +- shaded/hbase-server-shaded/pom.xml | 2 +- typesystem/pom.xml | 2 +- .../apache/atlas/typesystem/persistence/Id.java | 4 +- .../persistence/ReferenceableInstance.java | 4 +- .../typesystem/persistence/StructInstance.java | 4 +- webapp/pom.xml | 4 +- .../notification/NotificationHookConsumer.java | 58 +- .../atlas/web/filters/ActiveServerFilter.java | 15 +- .../web/filters/AtlasAuthenticationFilter.java | 25 +- .../atlas/web/resources/AdminResource.java | 8 +- .../apache/atlas/web/rest/DiscoveryREST.java | 2 +- .../NotificationHookConsumerKafkaTest.java | 2 +- .../web/filters/ActiveServerFilterTest.java | 35 +- .../atlas/web/integration/BaseResourceIT.java | 2 +- 154 files changed, 5177 insertions(+), 2523 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/22780b93/pom.xml ----------------------------------------------------------------------
