atlas git commit: ATLAS-2687: Create twiki documentation about classification propagation

2018-05-15 Thread sarath 
Repository: atlas
Updated Branches:
  refs/heads/master f65aeceeb -> 024484407


ATLAS-2687: Create twiki documentation about classification propagation


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

Branch: refs/heads/master
Commit: 024484407290ad664141c1a8c52012c3e7708c3c
Parents: f65aece
Author: Sarath Subramanian 
Authored: Tue May 15 16:29:04 2018 -0700
Committer: Sarath Subramanian 
Committed: Tue May 15 22:34:03 2018 -0700

--
 .../twiki/classification-propagation-1.png  | Bin 0 -> 98689 bytes
 .../twiki/classification-propagation-2.png  | Bin 0 -> 128774 bytes
 .../twiki/classification-propagation-3.png  | Bin 0 -> 128278 bytes
 .../twiki/classification-propagation-4.png  | Bin 0 -> 106518 bytes
 .../twiki/classification-propagation-5.png  | Bin 0 -> 78040 bytes
 .../twiki/classification-propagation-6.png  | Bin 0 -> 69127 bytes
 .../twiki/classification-propagation-7.png  | Bin 0 -> 72418 bytes
 .../twiki/classification-propagation-8.png  | Bin 0 -> 140839 bytes
 .../site/twiki/ClassificationPropagation.twiki  |  86 +++
 docs/src/site/twiki/index.twiki |   1 +
 10 files changed, 87 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/02448440/docs/src/site/resources/images/twiki/classification-propagation-1.png
--
diff --git 
a/docs/src/site/resources/images/twiki/classification-propagation-1.png 
b/docs/src/site/resources/images/twiki/classification-propagation-1.png
new file mode 100644
index 000..2e27424
Binary files /dev/null and 
b/docs/src/site/resources/images/twiki/classification-propagation-1.png differ

http://git-wip-us.apache.org/repos/asf/atlas/blob/02448440/docs/src/site/resources/images/twiki/classification-propagation-2.png
--
diff --git 
a/docs/src/site/resources/images/twiki/classification-propagation-2.png 
b/docs/src/site/resources/images/twiki/classification-propagation-2.png
new file mode 100644
index 000..352db3b
Binary files /dev/null and 
b/docs/src/site/resources/images/twiki/classification-propagation-2.png differ

http://git-wip-us.apache.org/repos/asf/atlas/blob/02448440/docs/src/site/resources/images/twiki/classification-propagation-3.png
--
diff --git 
a/docs/src/site/resources/images/twiki/classification-propagation-3.png 
b/docs/src/site/resources/images/twiki/classification-propagation-3.png
new file mode 100644
index 000..355bdf9
Binary files /dev/null and 
b/docs/src/site/resources/images/twiki/classification-propagation-3.png differ

http://git-wip-us.apache.org/repos/asf/atlas/blob/02448440/docs/src/site/resources/images/twiki/classification-propagation-4.png
--
diff --git 
a/docs/src/site/resources/images/twiki/classification-propagation-4.png 
b/docs/src/site/resources/images/twiki/classification-propagation-4.png
new file mode 100644
index 000..74d8ea1
Binary files /dev/null and 
b/docs/src/site/resources/images/twiki/classification-propagation-4.png differ

http://git-wip-us.apache.org/repos/asf/atlas/blob/02448440/docs/src/site/resources/images/twiki/classification-propagation-5.png
--
diff --git 
a/docs/src/site/resources/images/twiki/classification-propagation-5.png 
b/docs/src/site/resources/images/twiki/classification-propagation-5.png
new file mode 100644
index 000..66350e4
Binary files /dev/null and 
b/docs/src/site/resources/images/twiki/classification-propagation-5.png differ

http://git-wip-us.apache.org/repos/asf/atlas/blob/02448440/docs/src/site/resources/images/twiki/classification-propagation-6.png
--
diff --git 
a/docs/src/site/resources/images/twiki/classification-propagation-6.png 
b/docs/src/site/resources/images/twiki/classification-propagation-6.png
new file mode 100644
index 000..1669bed
Binary files /dev/null and 
b/docs/src/site/resources/images/twiki/classification-propagation-6.png differ

http://git-wip-us.apache.org/repos/asf/atlas/blob/02448440/docs/src/site/resources/images/twiki/classification-propagation-7.png
--
diff --git 
a/docs/src/site/resources/images/twiki/classification-propagation-7.png

atlas git commit: ATLAS-2671: Dependency upgrades

2018-05-15 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/branch-1.0 65e3a1147 -> 05d503596


ATLAS-2671: Dependency upgrades

Jackson, Lucene, Spring, Tinkerpop 3.3.3

Change-Id: If8972b9ec79aaed300c85eeba213b1dc40577814
(cherry picked from commit f65aeceeb97156ff9e26f1352a6da4100845cb7a)


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

Branch: refs/heads/branch-1.0
Commit: 05d5035961c551232f7847fbbe3bf7780965bd86
Parents: 65e3a11
Author: apoorvnaik 
Authored: Thu May 10 08:05:31 2018 -0700
Committer: Madhan Neethiraj 
Committed: Tue May 15 22:14:04 2018 -0700

--
 graphdb/janus/pom.xml   | 29 +++-
 .../janus/migration/AtlasGraphSONReader.java|  3 +-
 .../graphdb/janus/migration/BaseUtils.java  |  3 +-
 pom.xml |  6 ++--
 4 files changed, 35 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/05d50359/graphdb/janus/pom.xml
--
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index fd80692..e74a587 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -34,9 +34,10 @@
  Some dependencies, like slf4j are excluded from the jar because they 
are included in Atlas -->
 
 
-3.2.6
+3.3.3
 0.2.0
 false
+7.3.0
 
 
 
@@ -173,6 +174,32 @@
 solr-solrj
 7.0.0
 
+
+
+org.apache.lucene
+lucene-core
+${lucene-solr.version}
+
+
+org.apache.lucene
+lucene-analyzers-common
+${lucene-solr.version}
+
+
+org.apache.lucene
+lucene-queryparser
+${lucene-solr.version}
+
+
+org.apache.lucene
+lucene-spatial
+${lucene-solr.version}
+
+
+org.apache.lucene
+lucene-spatial-extras
+${lucene-solr.version}
+
 
 
 com.fasterxml.jackson.core

http://git-wip-us.apache.org/repos/asf/atlas/blob/05d50359/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
--
diff --git 
a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
 
b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
index aa0b637..ae119b0 100644
--- 
a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
+++ 
b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
@@ -25,6 +25,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
 import org.apache.tinkerpop.shaded.jackson.core.JsonFactory;
 import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
 import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
@@ -257,7 +258,7 @@ public final class AtlasGraphSONReader {
 }
 
 final GraphSONMapper.Builder builder = GraphSONMapper.build();
-final GraphSONMapper mapper  = 
builder.embedTypes(false).create();
+final GraphSONMapper mapper  = 
builder.typeInfo(TypeInfo.NO_TYPES).create();
 
 return new AtlasGraphSONReader(mapper.createMapper(), 
relationshipCache, graph, bulkLoadGraph,
propertiesToPostProcess, 
numWorkers, batchSize, suppliedStartIndex);

http://git-wip-us.apache.org/repos/asf/atlas/blob/05d50359/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
--
diff --git 
a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
 
b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
index de43e0f..e863d9f 100644
--- 
a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
+++ 
b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
@@

atlas git commit: ATLAS-2671: Dependency upgrades

2018-05-15 Thread apoorvnaik 
Repository: atlas
Updated Branches:
  refs/heads/master 66f8ae160 -> f65aeceeb


ATLAS-2671: Dependency upgrades

Jackson, Lucene, Spring, Tinkerpop 3.3.3

Change-Id: If8972b9ec79aaed300c85eeba213b1dc40577814


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

Branch: refs/heads/master
Commit: f65aeceeb97156ff9e26f1352a6da4100845cb7a
Parents: 66f8ae1
Author: apoorvnaik 
Authored: Thu May 10 08:05:31 2018 -0700
Committer: apoorvnaik 
Committed: Tue May 15 22:09:51 2018 -0700

--
 graphdb/janus/pom.xml   | 29 +++-
 .../janus/migration/AtlasGraphSONReader.java|  3 +-
 .../graphdb/janus/migration/BaseUtils.java  |  3 +-
 pom.xml |  6 ++--
 4 files changed, 35 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/f65aecee/graphdb/janus/pom.xml
--
diff --git a/graphdb/janus/pom.xml b/graphdb/janus/pom.xml
index 016a09c..2658bfd 100644
--- a/graphdb/janus/pom.xml
+++ b/graphdb/janus/pom.xml
@@ -34,9 +34,10 @@
  Some dependencies, like slf4j are excluded from the jar because they 
are included in Atlas -->
 
 
-3.2.6
+3.3.3
 0.2.0
 false
+7.3.0
 
 
 
@@ -173,6 +174,32 @@
 solr-solrj
 7.0.0
 
+
+
+org.apache.lucene
+lucene-core
+${lucene-solr.version}
+
+
+org.apache.lucene
+lucene-analyzers-common
+${lucene-solr.version}
+
+
+org.apache.lucene
+lucene-queryparser
+${lucene-solr.version}
+
+
+org.apache.lucene
+lucene-spatial
+${lucene-solr.version}
+
+
+org.apache.lucene
+lucene-spatial-extras
+${lucene-solr.version}
+
 
 
 com.fasterxml.jackson.core

http://git-wip-us.apache.org/repos/asf/atlas/blob/f65aecee/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
--
diff --git 
a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
 
b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
index aa0b637..ae119b0 100644
--- 
a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
+++ 
b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/AtlasGraphSONReader.java
@@ -25,6 +25,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
 import org.apache.tinkerpop.shaded.jackson.core.JsonFactory;
 import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
 import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
@@ -257,7 +258,7 @@ public final class AtlasGraphSONReader {
 }
 
 final GraphSONMapper.Builder builder = GraphSONMapper.build();
-final GraphSONMapper mapper  = 
builder.embedTypes(false).create();
+final GraphSONMapper mapper  = 
builder.typeInfo(TypeInfo.NO_TYPES).create();
 
 return new AtlasGraphSONReader(mapper.createMapper(), 
relationshipCache, graph, bulkLoadGraph,
propertiesToPostProcess, 
numWorkers, batchSize, suppliedStartIndex);

http://git-wip-us.apache.org/repos/asf/atlas/blob/f65aecee/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
--
diff --git 
a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
 
b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
index de43e0f..e863d9f 100644
--- 
a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
+++ 
b/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/BaseUtils.java
@@ -22,6 +22,7 @@ import org.apache.commons.io.FileUtils;
 import

[1/2] atlas git commit: ATLAS-2679: Update qualifiedName category hierarchy corresponding to any change to category

2018-05-15 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/branch-1.0 562550c5b -> 65e3a1147


http://git-wip-us.apache.org/repos/asf/atlas/blob/65e3a114/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java
--
diff --git 
a/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java 
b/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java
index 84d1b87..f661650 100644
--- 
a/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java
+++ 
b/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java
@@ -314,7 +314,12 @@ public class GlossaryServiceTest {
 List categories = 
glossaryService.createCategories(Arrays.asList(accountCategory, 
mortgageCategory));
 
 accountCategory.setGuid(categories.get(0).getGuid());
+assertNotNull(accountCategory.getParentCategory());
+
assertEquals(accountCategory.getParentCategory().getCategoryGuid(), 
customerCategory.getGuid());
+
assertTrue(accountCategory.getQualifiedName().endsWith(customerCategory.getQualifiedName()));
+
 mortgageCategory.setGuid(categories.get(1).getGuid());
+assertNull(mortgageCategory.getParentCategory());
 } catch (AtlasBaseException e) {
 fail("Category creation should've succeeded", e);
 }
@@ -395,11 +400,51 @@ public class GlossaryServiceTest {
 public void testDeleteGlossary() {
 try {
 glossaryService.deleteGlossary(bankGlossary.getGuid());
+// Fetch deleted glossary
 try {
 glossaryService.getGlossary(bankGlossary.getGuid());
 } catch (AtlasBaseException e) {
 assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
 }
+
+// Fetch delete terms
+try {
+glossaryService.getTerm(fixedRateMortgage.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getTerm(adjustableRateMortgage.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getTerm(savingsAccount.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getTerm(checkingAccount.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+
+// Fetch deleted categories
+try {
+glossaryService.getCategory(customerCategory.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getCategory(accountCategory.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getCategory(mortgageCategory.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
 } catch (AtlasBaseException e) {
 fail("Glossary delete should've succeeded", e);
 }
@@ -460,11 +505,22 @@ public class GlossaryServiceTest {
 
 // Unlink children
 try {
-AtlasGlossaryCategory category = 
glossaryService.getCategory(customerCategory.getGuid());
-category.setChildrenCategories(null);
-category = glossaryService.updateCategory(category);
-assertNotNull(category);
-assertNull(category.getChildrenCategories());
+customerCategory = 
glossaryService.getCategory(customerCategory.getGuid());
+customerCategory.setChildrenCategories(null);
+customerCategory = 
glossaryService.updateCategory(customerCategory);
+assertNotNull(customerCategory);
+assertNull(customerCategory.getChildrenCategories());
+
+accountCategory = 
glossaryService.getCategory(accountCategory.getGuid());
+assertNull(accountCategory.getParentCategory());
+
assertTrue(accountCategory.getQualifiedName().endsWith(bankGlossary.getQualifiedName()));
+
+mortgageCategory = 
glossaryService.getCategory(mortgageCategory.getGuid());
+assertNull(mortgageCategory.getParentCategory());
+

[2/2] atlas git commit: ATLAS-2679: Update qualifiedName category hierarchy corresponding to any change to category

2018-05-15 Thread madhan 
ATLAS-2679: Update qualifiedName category hierarchy corresponding to any change 
to category

Change-Id: I4cddcfe76eabcf7ee705b60848521158bb33a8a5
(cherry picked from commit 66f8ae16045b79d8839ee2088fc5cc64ffa2fa5d)


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

Branch: refs/heads/branch-1.0
Commit: 65e3a1147d0babc73361be518bf282713e13f2f7
Parents: 562550c
Author: apoorvnaik 
Authored: Thu May 10 16:09:12 2018 -0700
Committer: Madhan Neethiraj 
Committed: Tue May 15 22:10:26 2018 -0700

--
 .../java/org/apache/atlas/AtlasErrorCode.java   |   3 +-
 .../atlas/model/glossary/AtlasGlossary.java |   7 +-
 .../model/glossary/AtlasGlossaryBaseObject.java |  14 +-
 .../model/glossary/AtlasGlossaryCategory.java   |   6 -
 .../atlas/model/glossary/AtlasGlossaryTerm.java |   2 -
 .../atlas/glossary/GlossaryCategoryUtils.java   | 293 +--
 .../apache/atlas/glossary/GlossaryService.java  | 184 ++--
 .../atlas/glossary/GlossaryTermUtils.java   | 108 ---
 .../apache/atlas/glossary/GlossaryUtils.java|  23 ++
 .../atlas/glossary/GlossaryServiceTest.java | 129 +++-
 .../org/apache/atlas/web/rest/GlossaryREST.java |   2 +-
 11 files changed, 522 insertions(+), 249 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/65e3a114/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
--
diff --git a/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java 
b/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
index 7cf3fd1..3a60978 100644
--- a/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
+++ b/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
@@ -26,6 +26,7 @@ import java.util.Arrays;
 
 public enum AtlasErrorCode {
 NO_SEARCH_RESULTS(204, "ATLAS-204-00-001", "Given search filter {0} did 
not yield any results"),
+DATA_ACCESS_SAVE_FAILED(204, "ATLAS-204-00-002", "Save failed: {0} has no 
updates"),
 
 UNKNOWN_TYPE(400, "ATLAS-400-00-001", "Unknown type {0} for {1}.{2}"),
 CIRCULAR_REFERENCE(400, "ATLAS-400-00-002", "{0}: invalid supertypes - 
circular reference back to self {1}"),
@@ -144,6 +145,7 @@ public enum AtlasErrorCode {
 INVALID_CHILD_CATEGORY_DIFFERENT_GLOSSARY(400, "ATLAS-400-00-07F", 
"Invalid child category relationship: Child category (guid = {0}) belongs to 
different glossary"),
 INVALID_TERM_DISSOCIATION(400, "ATLAS-400-00-080", "Given term (guid={0}) 
is not associated to entity(guid={1})"),
 ATTRIBUTE_TYPE_INVALID(400, "ATLAS-400-00-081", "{0}.{1}: invalid 
attribute type. Attribute cannot be of type classification"),
+MISSING_CATEGORY_DISPLAY_NAME(400, "ATLAS-400-00-082", "Category 
displayName is empty/null"),
 
 UNAUTHORIZED_ACCESS(403, "ATLAS-403-00-001", "{0} is not authorized to 
perform {1}"),
 
@@ -196,7 +198,6 @@ public enum AtlasErrorCode {
 SQOOP_HOOK(500, "ATLAS-500-00-00F", "SqoopHook: {0}"),
 HIVE_HOOK(500, "ATLAS-500-00-010", "HiveHook: {0}"),
 HIVE_HOOK_METASTORE_BRIDGE(500, "ATLAS-500-00-011", 
"HiveHookMetaStoreBridge: {0}"),
-DATA_ACCESS_SAVE_FAILED(500, "ATLAS-500-00-012", "Save failed: {0}"),
 DATA_ACCESS_LOAD_FAILED(500, "ATLAS-500-00-013", "Load failed: {0}"),
 ENTITY_NOTIFICATION_FAILED(500, "ATLAS-500-00-014", "Notification failed 
for operation: {0} : {1}");
 

http://git-wip-us.apache.org/repos/asf/atlas/blob/65e3a114/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java
--
diff --git 
a/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java 
b/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java
index b99817c..ccd0b90 100644
--- a/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java
+++ b/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java
@@ -146,12 +146,10 @@ public class AtlasGlossary extends 
AtlasGlossaryBaseObject {
 
 @Override
 protected StringBuilder toString(final StringBuilder sb) {
-sb.append("{");
-sb.append("language='").append(language).append('\'');
+sb.append(", language='").append(language).append('\'');
 sb.append(", usage='").append(usage).append('\'');
 sb.append(", terms=").append(terms);
 sb.append(", categories=").append(categories);
-sb.append('}');
 
 return sb;
 }
@@ -234,11 +232,8 @@ public class AtlasGlossary extends AtlasGlossaryBaseObject 
{
 
 @Override
 public StringBuilder toString(StringBuilder sb) {
-

atlas git commit: ATLAS-2689: updated version in pom.xml files from 1.0.0-SNAPSHOT to 1.0.0

2018-05-15 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/branch-1.0 801db28bf -> 562550c5b


ATLAS-2689: updated version in pom.xml files from 1.0.0-SNAPSHOT to 1.0.0


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

Branch: refs/heads/branch-1.0
Commit: 562550c5b94da194fdbd82a385816dc14915943f
Parents: 801db28
Author: Madhan Neethiraj 
Authored: Tue May 15 21:07:23 2018 -0700
Committer: Madhan Neethiraj 
Committed: Tue May 15 21:52:42 2018 -0700

--
 addons/falcon-bridge-shim/pom.xml  |  2 +-
 addons/falcon-bridge/pom.xml   |  2 +-
 addons/hbase-bridge-shim/pom.xml   |  2 +-
 addons/hbase-bridge/pom.xml|  2 +-
 addons/hdfs-model/pom.xml  |  2 +-
 addons/hive-bridge-shim/pom.xml|  2 +-
 addons/hive-bridge/pom.xml |  2 +-
 addons/kafka-bridge/pom.xml|  2 +-
 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 +-
 client/client-v1/pom.xml   |  2 +-
 client/client-v2/pom.xml   |  2 +-
 client/common/pom.xml  |  4 ++--
 client/pom.xml |  2 +-
 common/pom.xml |  2 +-
 dashboardv2/pom.xml|  2 +-
 distro/pom.xml |  2 +-
 docs/pom.xml   |  2 +-
 graphdb/api/pom.xml|  2 +-
 graphdb/common/pom.xml |  2 +-
 graphdb/graphdb-impls/pom.xml  |  2 +-
 graphdb/janus/pom.xml  |  2 +-
 graphdb/pom.xml|  2 +-
 intg/pom.xml   |  2 +-
 notification/pom.xml   |  2 +-
 om-fwk-ocf/pom.xml |  4 ++--
 omag-api/pom.xml   |  8 
 omag-server/pom.xml| 14 +++---
 omas-assetconsumer/pom.xml | 12 ++--
 omas-connectedasset/pom.xml|  8 
 omrs/pom.xml   |  6 +++---
 plugin-classloader/pom.xml |  2 +-
 pom.xml|  2 +-
 repository/pom.xml |  2 +-
 server-api/pom.xml |  2 +-
 shaded/hbase-client-shaded/pom.xml |  2 +-
 shaded/hbase-server-shaded/pom.xml |  2 +-
 test-tools/pom.xml |  4 ++--
 tools/atlas-migration-exporter/pom.xml |  2 +-
 webapp/pom.xml |  2 +-
 43 files changed, 65 insertions(+), 65 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/562550c5/addons/falcon-bridge-shim/pom.xml
--
diff --git a/addons/falcon-bridge-shim/pom.xml 
b/addons/falcon-bridge-shim/pom.xml
index 3fbee25..87fb1e1 100755
--- a/addons/falcon-bridge-shim/pom.xml
+++ b/addons/falcon-bridge-shim/pom.xml
@@ -22,7 +22,7 @@
 
 apache-atlas
 org.apache.atlas
-1.0.0-SNAPSHOT
+1.0.0
 ../../
 
 falcon-bridge-shim

http://git-wip-us.apache.org/repos/asf/atlas/blob/562550c5/addons/falcon-bridge/pom.xml
--
diff --git a/addons/falcon-bridge/pom.xml b/addons/falcon-bridge/pom.xml
index 9db65dc..a56f29d 100644
--- a/addons/falcon-bridge/pom.xml
+++ b/addons/falcon-bridge/pom.xml
@@ -22,7 +22,7 @@
 
 apache-atlas
 org.apache.atlas
-1.0.0-SNAPSHOT
+1.0.0
 ../../
 
 falcon-bridge

http://git-wip-us.apache.org/repos/asf/atlas/blob/562550c5/addons/hbase-bridge-shim/pom.xml
--
diff --git a/addons/hbase-bridge-shim/pom.xml b/addons/hbase-bridge-shim/pom.xml
index 7df6007..9171ab0 100644
--- a/addons/hbase-bridge-shim/pom.xml
+++ b/addons/hbase-bridge-shim/pom.xml
@@ -22,7 +22,7 @@
 
 apache-atlas
 org.apache.atlas
-1.0.0-SNAPSHOT
+1.0.0
 ../../
 
 hbase-bridge-shim

http://git-wip-us.apache.org/repos/asf/atlas/blob/562550c5/addons/hbase-bridge/pom.xml
--
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index eea6b65..7249d95 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -22,7 +22,7 @@
 
 apache-atlas
 org.apache.atlas
-1.0.0-SNAPSHOT
+1.0.0
 ../../
 
 hbase-bridge

[2/2] atlas git commit: ATLAS-2679: Update qualifiedName category hierarchy corresponding to any change to category

2018-05-15 Thread apoorvnaik 
ATLAS-2679: Update qualifiedName category hierarchy corresponding to any change 
to category

Change-Id: I4cddcfe76eabcf7ee705b60848521158bb33a8a5


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

Branch: refs/heads/master
Commit: 66f8ae16045b79d8839ee2088fc5cc64ffa2fa5d
Parents: 801db28
Author: apoorvnaik 
Authored: Thu May 10 16:09:12 2018 -0700
Committer: apoorvnaik 
Committed: Tue May 15 21:07:26 2018 -0700

--
 .../java/org/apache/atlas/AtlasErrorCode.java   |   3 +-
 .../atlas/model/glossary/AtlasGlossary.java |   7 +-
 .../model/glossary/AtlasGlossaryBaseObject.java |  14 +-
 .../model/glossary/AtlasGlossaryCategory.java   |   6 -
 .../atlas/model/glossary/AtlasGlossaryTerm.java |   2 -
 .../atlas/glossary/GlossaryCategoryUtils.java   | 293 +--
 .../apache/atlas/glossary/GlossaryService.java  | 184 ++--
 .../atlas/glossary/GlossaryTermUtils.java   | 108 ---
 .../apache/atlas/glossary/GlossaryUtils.java|  23 ++
 .../atlas/glossary/GlossaryServiceTest.java | 129 +++-
 .../org/apache/atlas/web/rest/GlossaryREST.java |   2 +-
 11 files changed, 522 insertions(+), 249 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/66f8ae16/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
--
diff --git a/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java 
b/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
index 7cf3fd1..3a60978 100644
--- a/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
+++ b/intg/src/main/java/org/apache/atlas/AtlasErrorCode.java
@@ -26,6 +26,7 @@ import java.util.Arrays;
 
 public enum AtlasErrorCode {
 NO_SEARCH_RESULTS(204, "ATLAS-204-00-001", "Given search filter {0} did 
not yield any results"),
+DATA_ACCESS_SAVE_FAILED(204, "ATLAS-204-00-002", "Save failed: {0} has no 
updates"),
 
 UNKNOWN_TYPE(400, "ATLAS-400-00-001", "Unknown type {0} for {1}.{2}"),
 CIRCULAR_REFERENCE(400, "ATLAS-400-00-002", "{0}: invalid supertypes - 
circular reference back to self {1}"),
@@ -144,6 +145,7 @@ public enum AtlasErrorCode {
 INVALID_CHILD_CATEGORY_DIFFERENT_GLOSSARY(400, "ATLAS-400-00-07F", 
"Invalid child category relationship: Child category (guid = {0}) belongs to 
different glossary"),
 INVALID_TERM_DISSOCIATION(400, "ATLAS-400-00-080", "Given term (guid={0}) 
is not associated to entity(guid={1})"),
 ATTRIBUTE_TYPE_INVALID(400, "ATLAS-400-00-081", "{0}.{1}: invalid 
attribute type. Attribute cannot be of type classification"),
+MISSING_CATEGORY_DISPLAY_NAME(400, "ATLAS-400-00-082", "Category 
displayName is empty/null"),
 
 UNAUTHORIZED_ACCESS(403, "ATLAS-403-00-001", "{0} is not authorized to 
perform {1}"),
 
@@ -196,7 +198,6 @@ public enum AtlasErrorCode {
 SQOOP_HOOK(500, "ATLAS-500-00-00F", "SqoopHook: {0}"),
 HIVE_HOOK(500, "ATLAS-500-00-010", "HiveHook: {0}"),
 HIVE_HOOK_METASTORE_BRIDGE(500, "ATLAS-500-00-011", 
"HiveHookMetaStoreBridge: {0}"),
-DATA_ACCESS_SAVE_FAILED(500, "ATLAS-500-00-012", "Save failed: {0}"),
 DATA_ACCESS_LOAD_FAILED(500, "ATLAS-500-00-013", "Load failed: {0}"),
 ENTITY_NOTIFICATION_FAILED(500, "ATLAS-500-00-014", "Notification failed 
for operation: {0} : {1}");
 

http://git-wip-us.apache.org/repos/asf/atlas/blob/66f8ae16/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java
--
diff --git 
a/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java 
b/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java
index b99817c..ccd0b90 100644
--- a/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java
+++ b/intg/src/main/java/org/apache/atlas/model/glossary/AtlasGlossary.java
@@ -146,12 +146,10 @@ public class AtlasGlossary extends 
AtlasGlossaryBaseObject {
 
 @Override
 protected StringBuilder toString(final StringBuilder sb) {
-sb.append("{");
-sb.append("language='").append(language).append('\'');
+sb.append(", language='").append(language).append('\'');
 sb.append(", usage='").append(usage).append('\'');
 sb.append(", terms=").append(terms);
 sb.append(", categories=").append(categories);
-sb.append('}');
 
 return sb;
 }
@@ -234,11 +232,8 @@ public class AtlasGlossary extends AtlasGlossaryBaseObject 
{
 
 @Override
 public StringBuilder toString(StringBuilder sb) {
-sb.append("{");
-super.toString(sb);
 sb.append(",

[1/2] atlas git commit: ATLAS-2679: Update qualifiedName category hierarchy corresponding to any change to category

2018-05-15 Thread apoorvnaik 
Repository: atlas
Updated Branches:
  refs/heads/master 801db28bf -> 66f8ae160


http://git-wip-us.apache.org/repos/asf/atlas/blob/66f8ae16/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java
--
diff --git 
a/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java 
b/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java
index 84d1b87..f661650 100644
--- 
a/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java
+++ 
b/repository/src/test/java/org/apache/atlas/glossary/GlossaryServiceTest.java
@@ -314,7 +314,12 @@ public class GlossaryServiceTest {
 List categories = 
glossaryService.createCategories(Arrays.asList(accountCategory, 
mortgageCategory));
 
 accountCategory.setGuid(categories.get(0).getGuid());
+assertNotNull(accountCategory.getParentCategory());
+
assertEquals(accountCategory.getParentCategory().getCategoryGuid(), 
customerCategory.getGuid());
+
assertTrue(accountCategory.getQualifiedName().endsWith(customerCategory.getQualifiedName()));
+
 mortgageCategory.setGuid(categories.get(1).getGuid());
+assertNull(mortgageCategory.getParentCategory());
 } catch (AtlasBaseException e) {
 fail("Category creation should've succeeded", e);
 }
@@ -395,11 +400,51 @@ public class GlossaryServiceTest {
 public void testDeleteGlossary() {
 try {
 glossaryService.deleteGlossary(bankGlossary.getGuid());
+// Fetch deleted glossary
 try {
 glossaryService.getGlossary(bankGlossary.getGuid());
 } catch (AtlasBaseException e) {
 assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
 }
+
+// Fetch delete terms
+try {
+glossaryService.getTerm(fixedRateMortgage.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getTerm(adjustableRateMortgage.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getTerm(savingsAccount.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getTerm(checkingAccount.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+
+// Fetch deleted categories
+try {
+glossaryService.getCategory(customerCategory.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getCategory(accountCategory.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
+try {
+glossaryService.getCategory(mortgageCategory.getGuid());
+} catch (AtlasBaseException e) {
+assertEquals(e.getAtlasErrorCode(), 
AtlasErrorCode.INSTANCE_GUID_NOT_FOUND);
+}
 } catch (AtlasBaseException e) {
 fail("Glossary delete should've succeeded", e);
 }
@@ -460,11 +505,22 @@ public class GlossaryServiceTest {
 
 // Unlink children
 try {
-AtlasGlossaryCategory category = 
glossaryService.getCategory(customerCategory.getGuid());
-category.setChildrenCategories(null);
-category = glossaryService.updateCategory(category);
-assertNotNull(category);
-assertNull(category.getChildrenCategories());
+customerCategory = 
glossaryService.getCategory(customerCategory.getGuid());
+customerCategory.setChildrenCategories(null);
+customerCategory = 
glossaryService.updateCategory(customerCategory);
+assertNotNull(customerCategory);
+assertNull(customerCategory.getChildrenCategories());
+
+accountCategory = 
glossaryService.getCategory(accountCategory.getGuid());
+assertNull(accountCategory.getParentCategory());
+
assertTrue(accountCategory.getQualifiedName().endsWith(bankGlossary.getQualifiedName()));
+
+mortgageCategory = 
glossaryService.getCategory(mortgageCategory.getGuid());
+assertNull(mortgageCategory.getParentCategory());
+

[atlas] Git Push Summary

2018-05-15 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/branch-1.0 [created] 801db28bf

atlas git commit: ATLAS-2632 Tag Propagation : Tag is added to propagatedClassification twice when relationship is updated to BOTH

2018-05-15 Thread sarath 
Repository: atlas
Updated Branches:
  refs/heads/master 0eaefe38f -> 801db28bf


ATLAS-2632 Tag Propagation : Tag is added to propagatedClassification twice 
when relationship is updated to BOTH


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

Branch: refs/heads/master
Commit: 801db28bf772b111b776a0dda0d305344c2eef4d
Parents: 0eaefe3
Author: Sarath Subramanian 
Authored: Tue May 15 14:24:55 2018 -0700
Committer: Sarath Subramanian 
Committed: Tue May 15 14:24:55 2018 -0700

--
 .../atlas/model/instance/AtlasRelationship.java | 21 ++--
 .../graph/v1/AtlasRelationshipStoreV1.java  |  2 +-
 .../store/graph/v1/EntityGraphRetriever.java| 11 +-
 .../ClassificationPropagationTest.java  | 21 ++--
 4 files changed, 29 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/801db28b/intg/src/main/java/org/apache/atlas/model/instance/AtlasRelationship.java
--
diff --git 
a/intg/src/main/java/org/apache/atlas/model/instance/AtlasRelationship.java 
b/intg/src/main/java/org/apache/atlas/model/instance/AtlasRelationship.java
index d04daa5..debaeef 100644
--- a/intg/src/main/java/org/apache/atlas/model/instance/AtlasRelationship.java
+++ b/intg/src/main/java/org/apache/atlas/model/instance/AtlasRelationship.java
@@ -30,12 +30,13 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
 import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
@@ -82,8 +83,8 @@ public class AtlasRelationship extends AtlasStruct implements 
Serializable {
 
 public enum Status { ACTIVE, DELETED }
 
-private List propagatedClassifications;
-private List blockedPropagatedClassifications;
+private Set propagatedClassifications;
+private Set blockedPropagatedClassifications;
 
 @JsonIgnore
 private static AtomicLong s_nextId = new AtomicLong(System.nanoTime());
@@ -198,7 +199,7 @@ public class AtlasRelationship extends AtlasStruct 
implements Serializable {
 }
 
 if (CollectionUtils.isNotEmpty((List) propagatedClassifications)) {
-this.propagatedClassifications = new ArrayList<>();
+this.propagatedClassifications = new HashSet<>();
 
 for (Object elem : (List) propagatedClassifications) {
 if (elem instanceof AtlasClassification) {
@@ -210,7 +211,7 @@ public class AtlasRelationship extends AtlasStruct 
implements Serializable {
 }
 
 if (CollectionUtils.isNotEmpty((List) 
blockedPropagatedClassifications)) {
-this.blockedPropagatedClassifications = new ArrayList<>();
+this.blockedPropagatedClassifications = new HashSet<>();
 
 for (Object elem : (List) blockedPropagatedClassifications) {
 if (elem instanceof AtlasClassification) {
@@ -308,19 +309,19 @@ public class AtlasRelationship extends AtlasStruct 
implements Serializable {
 return "-" + Long.toString(s_nextId.getAndIncrement());
 }
 
-public List getPropagatedClassifications() {
+public Set getPropagatedClassifications() {
 return propagatedClassifications;
 }
 
-public void setPropagatedClassifications(List 
propagatedClassifications) {
+public void setPropagatedClassifications(Set 
propagatedClassifications) {
 this.propagatedClassifications = propagatedClassifications;
 }
 
-public List getBlockedPropagatedClassifications() {
+public Set getBlockedPropagatedClassifications() {
 return blockedPropagatedClassifications;
 }
 
-public void setBlockedPropagatedClassifications(List 
blockedPropagatedClassifications) {
+public void setBlockedPropagatedClassifications(Set 
blockedPropagatedClassifications) {
 this.blockedPropagatedClassifications = 
blockedPropagatedClassifications;
 }
 
@@ -330,7 +331,7 @@ public class AtlasRelationship extends AtlasStruct 
implements Serializable {
 
 private void init(String guid, AtlasObjectId end1, AtlasObjectId end2, 
String label, PropagateTags propagateTags,
   Status status, String

atlas git commit: ATLAS-2638: Disabling tag propagation at an edge : Switching propagate flag after adding tag to blockedPropagatedClassifications

2018-05-15 Thread sarath 
Repository: atlas
Updated Branches:
  refs/heads/master a6f9b9bed -> 0eaefe38f


ATLAS-2638: Disabling tag propagation at an edge : Switching propagate flag 
after adding tag to blockedPropagatedClassifications


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

Branch: refs/heads/master
Commit: 0eaefe38f2c650d098e943dd1614c633f16e7481
Parents: a6f9b9b
Author: Sarath Subramanian 
Authored: Tue May 15 14:16:18 2018 -0700
Committer: Sarath Subramanian 
Committed: Tue May 15 14:16:18 2018 -0700

--
 .../apache/atlas/repository/store/graph/v1/EntityGraphMapper.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/0eaefe38/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphMapper.java
--
diff --git 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphMapper.java
 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphMapper.java
index 287dacc..8344b70 100644
--- 
a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphMapper.java
+++ 
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityGraphMapper.java
@@ -1534,7 +1534,7 @@ public class EntityGraphMapper {
 }
 
 if (isClassificationUpdated && 
CollectionUtils.isEmpty(entitiesToPropagateTo)) {
-entitiesToPropagateTo = graphHelper.getImpactedVertices(guid);
+entitiesToPropagateTo = 
graphHelper.getImpactedVerticesWithRestrictions(guid, 
classificationVertex.getIdForDisplay());
 }
 
 if (LOG.isDebugEnabled()) {

atlas git commit: ATLAS-2672: Disable failing UTs related to data migration until ATLAS-2637 is resolved

2018-05-15 Thread sarath 
Repository: atlas
Updated Branches:
  refs/heads/master fa712590e -> a6f9b9bed


ATLAS-2672: Disable failing UTs related to data migration until ATLAS-2637 is 
resolved


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

Branch: refs/heads/master
Commit: a6f9b9beda46b388742971ab39e609c18e88e948
Parents: fa71259
Author: Sarath Subramanian 
Authored: Tue May 15 11:07:44 2018 -0700
Committer: Sarath Subramanian 
Committed: Tue May 15 11:07:44 2018 -0700

--
 .../org/apache/atlas/repository/migration/HiveParititionTest.java  | 2 +-
 .../java/org/apache/atlas/repository/migration/HiveStocksTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/a6f9b9be/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
--
diff --git 
a/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
 
b/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
index c03b81e..ac0b79d 100644
--- 
a/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
+++ 
b/repository/src/test/java/org/apache/atlas/repository/migration/HiveParititionTest.java
@@ -41,7 +41,7 @@ public class HiveParititionTest extends  MigrationBaseAsserts 
{
 super(graph);
 }
 
-@Test
+@Test(enabled = false)
 public void fileImporterTest() throws IOException, AtlasBaseException {
 final int EXPECTED_TOTAL_COUNT = 141;
 final int EXPECTED_DB_COUNT = 1;

http://git-wip-us.apache.org/repos/asf/atlas/blob/a6f9b9be/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
--
diff --git 
a/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
 
b/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
index e216749..ffbf320 100644
--- 
a/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
+++ 
b/repository/src/test/java/org/apache/atlas/repository/migration/HiveStocksTest.java
@@ -35,7 +35,7 @@ public class HiveStocksTest extends MigrationBaseAsserts {
 super(graph);
 }
 
-@Test
+@Test(enabled = false)
 public void migrateStocks() throws AtlasBaseException, IOException {
 final int EXPECTED_TOTAL_COUNT  = 188;
 final int EXPECTED_DB_COUNT = 1;

atlas git commit: ATLAS-2676 : UI fix to address basic-search handling of term input in IE

2018-05-15 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/master f756e9b36 -> fa712590e


ATLAS-2676 : UI fix to address basic-search handling of term input in IE

Signed-off-by: Madhan Neethiraj 


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

Branch: refs/heads/master
Commit: fa712590e929d0c8c3ee7c048687bd1fe4ddd59e
Parents: f756e9b
Author: kevalbhatt 
Authored: Tue May 15 17:47:02 2018 +0530
Committer: Madhan Neethiraj 
Committed: Tue May 15 08:09:47 2018 -0700

--
 dashboardv2/public/css/scss/glossary.scss | 2 +-
 dashboardv2/public/js/modules/atlasLogin.js   | 7 ++-
 .../public/js/templates/glossary/GlossaryLayoutView_tmpl.html | 4 ++--
 dashboardv2/public/js/utils/CommonViewFunction.js | 1 -
 dashboardv2/public/js/utils/Overrides.js  | 7 +++
 .../public/js/views/detail_page/DetailPageLayoutView.js   | 2 +-
 dashboardv2/public/js/views/glossary/GlossaryLayoutView.js| 4 ++--
 dashboardv2/public/js/views/search/SearchLayoutView.js| 5 +++--
 dashboardv2/public/js/views/search/SearchResultLayoutView.js  | 2 +-
 9 files changed, 23 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/fa712590/dashboardv2/public/css/scss/glossary.scss
--
diff --git a/dashboardv2/public/css/scss/glossary.scss 
b/dashboardv2/public/css/scss/glossary.scss
index 98c977d..760711f 100644
--- a/dashboardv2/public/css/scss/glossary.scss
+++ b/dashboardv2/public/css/scss/glossary.scss
@@ -27,7 +27,7 @@
 overflow: hidden;
 text-overflow: ellipsis;
 }
-.jstree-children {
+.jstree-children.jstree-children>li>a {
 max-width: 500px;
 }
 .jstree-clicked,

http://git-wip-us.apache.org/repos/asf/atlas/blob/fa712590/dashboardv2/public/js/modules/atlasLogin.js
--
diff --git a/dashboardv2/public/js/modules/atlasLogin.js 
b/dashboardv2/public/js/modules/atlasLogin.js
index 0aa59e0..5206288 100644
--- a/dashboardv2/public/js/modules/atlasLogin.js
+++ b/dashboardv2/public/js/modules/atlasLogin.js
@@ -18,7 +18,7 @@
 
 
 //Define indexOf for IE
-if (!Array.indexOf) {
+if (!Array.prototype.indexOf) {
 Array.prototype.indexOf = function(obj, start) {
 for (var i = (start || 0); i < this.length; i++) {
 if (this[i] == obj) {
@@ -29,6 +29,11 @@ if (!Array.indexOf) {
 };
 }
 
+if (!String.prototype.startsWith) {
+String.prototype.startsWith = function(str, matchStr) {
+return str.lastIndexOf(matchStr, 0) === 0
+}
+}
 
 function doLogin() {
 

http://git-wip-us.apache.org/repos/asf/atlas/blob/fa712590/dashboardv2/public/js/templates/glossary/GlossaryLayoutView_tmpl.html
--
diff --git 
a/dashboardv2/public/js/templates/glossary/GlossaryLayoutView_tmpl.html 
b/dashboardv2/public/js/templates/glossary/GlossaryLayoutView_tmpl.html
index b870e6b..1fa1e35 100644
--- a/dashboardv2/public/js/templates/glossary/GlossaryLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/glossary/GlossaryLayoutView_tmpl.html
@@ -38,14 +38,14 @@
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/atlas/blob/fa712590/dashboardv2/public/js/utils/CommonViewFunction.js
--
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js 
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 3ee7609..bcff5e4 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -763,7 +763,6 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
 }
 }
 CommonViewFunction.addRestCsrfCustomHeader = function(xhr, settings) {
-//if (settings.url == null || 
!settings.url.startsWith('/webhdfs/')) {
 if (settings.url == null) {
 return;
 }

http://git-wip-us.apache.org/repos/asf/atlas/blob/fa712590/dashboardv2/public/js/utils/Overrides.js
--
diff --git a/dashboardv2/public/js/utils/Overrides.js 
b/dashboardv2/public/js/utils/Overrides.js
index efd5e40..a96fc2c 100644
--- a/dashboardv2/public/js/utils/Overrides.js
+++

atlas git commit: ATLAS-2463: documentation of Atlas authorization model

2018-05-15 Thread madhan 
Repository: atlas
Updated Branches:
  refs/heads/master fccfe919d -> f756e9b36


ATLAS-2463: documentation of Atlas authorization model

Signed-off-by: Madhan Neethiraj 


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

Branch: refs/heads/master
Commit: f756e9b36fa27ce6a01e081636884106990e936a
Parents: fccfe91
Author: nixonrodrigues 
Authored: Tue May 15 06:52:00 2018 -0700
Committer: Madhan Neethiraj 
Committed: Tue May 15 08:05:08 2018 -0700

--
 docs/src/site/twiki/Atlas-Authentication.twiki  | 113 +
 .../site/twiki/Atlas-Authorization-Model.twiki  | 110 
 .../Atlas-Authorization-Simple-Authorizer.twiki | 141 
 .../twiki/Authentication-Authorization.twiki| 166 ---
 docs/src/site/twiki/index.twiki |   4 +-
 5 files changed, 367 insertions(+), 167 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/f756e9b3/docs/src/site/twiki/Atlas-Authentication.twiki
--
diff --git a/docs/src/site/twiki/Atlas-Authentication.twiki 
b/docs/src/site/twiki/Atlas-Authentication.twiki
new file mode 100644
index 000..ddaa7fe
--- /dev/null
+++ b/docs/src/site/twiki/Atlas-Authentication.twiki
@@ -0,0 +1,113 @@
+---++ Authentication in Apache Atlas.
+
+---+++ Authentication
+
+Atlas supports following authentication methods
+
+   * *File*
+   * *Kerberos*
+   * *LDAP*
+
+
+Following properties should be set true to enable the authentication of that 
type in =atlas-application.properties= file.
+
+
+
+atlas.authentication.method.kerberos=true|false
+atlas.authentication.method.ldap=true|false
+atlas.authentication.method.file=true|false
+
+
+If two or more authentication methods are set to true, then the authentication 
falls back to the latter method if the earlier one fails.
+For example if Kerberos authentication is set to true and ldap authentication 
is also set to true then, if for a request without kerberos principal and 
keytab LDAP authentication will be used as a fallback scenario.
+
+---FILE method.
+
+File authentication requires users' login details in users credentials file in 
the format specified below and
+the file path should set to property 
=atlas.authentication.method.file.filename= in =atlas-application.properties=.
+
+
+atlas.authentication.method.file=true
+atlas.authentication.method.file.filename=${sys:atlas.home}/conf/users-credentials.properties
+
+
+The users credentials file should have below format
+
+username=group::sha256-password
+
+
+For e.g.
+
+admin=ADMIN::e7cf3ef4f17c3999a94f2c6f612e8a888e5b1026878e4e19398b23bd38ec221a
+
+
+Users group can be either *ADMIN*, *DATA_STEWARD* OR *DATA_SCIENTIST*
+
+*Note*:-password is encoded with sha256 encoding method and can be generated 
using unix tool.
+
+For e.g.
+
+echo -n "Password" | sha256sum
+e7cf3ef4f17c3999a94f2c6f612e8a888e5b1026878e4e19398b23bd38ec221a  -
+
+
+--- Kerberos Method.
+
+To enable the authentication in Kerberos mode in Atlas, set the property 
=atlas.authentication.method.kerberos= to true in =atlas-application.properties=
+
+
+atlas.authentication.method.kerberos = true
+
+
+Also following properties should be set.
+
+
+atlas.authentication.method.kerberos.principal=/@EXAMPLE.COM
+atlas.authentication.method.kerberos.keytab = /.keytab
+atlas.authentication.method.kerberos.name.rules = 
RULE:[2:$1@$0](at...@example.com)s/.*/atlas/
+atlas.authentication.method.kerberos.token.validity = 3600 [ in Seconds 
(optional)]
+
+
+
+--- LDAP Method.
+
+To enable the authentication in LDAP mode in Atlas, set the property 
=atlas.authentication.method.ldap= to true and also set Ldap type to property 
=atlas.authentication.method.ldap.type= to LDAP or AD in 
=atlas-application.properties=.
+Use AD if connecting to Active Directory.
+
+
+atlas.authentication.method.ldap=true
+atlas.authentication.method.ldap.type=ldap|ad
+
+
+
+For LDAP or AD the following configuration needs to be set in atlas 
application properties.
+
+*Active Directory*
+
+
+atlas.authentication.method.ldap.ad.domain= example.com
+atlas.authentication.method.ldap.ad.url=ldap://:389
+atlas.authentication.method.ldap.ad.base.dn=DC=example,DC=com
+atlas.authentication.method.ldap.ad.bind.dn=CN=Administrator,CN=Users,DC=example,DC=com
+atlas.authentication.method.ldap.ad.bind.password=
+atlas.authentication.method.ldap.ad.referral=ignore
+atlas.authentication.method.ldap.ad.user.searchfilter=(sAMAccountName={0})
+atlas.authentication.method.ldap.ad.default.role=ROLE_USER
+
+
+*LDAP Directroy*
+
+