atlas git commit: ATLAS-2052: updated packaing to exclude junit jar

2017-08-16 Thread madhan
Repository: atlas
Updated Branches:
  refs/heads/master fae008252 -> 56374ff7e


ATLAS-2052: updated packaing to exclude junit jar


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

Branch: refs/heads/master
Commit: 56374ff7e3a6faa3e444db1ba3fa14905f356dc9
Parents: fae0082
Author: Madhan Neethiraj 
Authored: Tue Aug 15 15:16:57 2017 -0700
Committer: Madhan Neethiraj 
Committed: Wed Aug 16 18:30:48 2017 -0700

--
 pom.xml| 30 ++
 webapp/pom.xml |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/56374ff7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8b9eee6..db71c02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -834,6 +834,10 @@
 com.google.guava
 guava
 
+
+junit
+junit
+
 
 
 
@@ -1152,6 +1156,10 @@
 *
 org.mortbay.jetty
 
+
+junit
+junit
+
 
 
 
@@ -1160,6 +1168,12 @@
 hbase-server
 ${hbase.version}
 tests
+
+
+junit
+junit
+
+
 
 
 
@@ -1175,6 +1189,10 @@
 tomcat
 *
 
+
+junit
+junit
+
 
 
 
@@ -1388,12 +1406,24 @@
 org.apache.atlas
 atlas-hbase-client-shaded
 ${project.version}
+
+
+junit
+junit
+
+
 
 
 
 org.apache.atlas
 atlas-hbase-server-shaded
 ${project.version}
+
+
+junit
+junit
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/atlas/blob/56374ff7/webapp/pom.xml
--
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 42981e0..2a06027 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -511,7 +511,7 @@
 
 
-
WEB-INF/lib/titan*.jar,WEB-INF/lib/hbase*.jar,${packages.to.exclude}
+
WEB-INF/lib/titan*.jar,WEB-INF/lib/hbase*.jar,WEB-INF/lib/junit*.jar,${packages.to.exclude}
 
 
 



atlas git commit: ATLAS-2048: Fix for Unit test failure on 0.8-incubating branch

2017-08-16 Thread sarath
Repository: atlas
Updated Branches:
  refs/heads/0.8-incubating 374cc342d -> 8967f0cf6


ATLAS-2048: Fix for Unit test failure on 0.8-incubating branch

Signed-off-by: Sarath Subramanian 


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

Branch: refs/heads/0.8-incubating
Commit: 8967f0cf62cae4c6d6215a7fb4fc0b1d7bac9789
Parents: 374cc34
Author: nixonrodrigues 
Authored: Wed Aug 16 11:58:10 2017 -0700
Committer: Sarath Subramanian 
Committed: Wed Aug 16 11:58:10 2017 -0700

--
 .../NotificationHookConsumerKafkaTest.java  | 26 ++--
 1 file changed, 2 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/8967f0cf/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java
--
diff --git 
a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java
 
b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java
index 1a3c413..eb37fa8 100644
--- 
a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java
+++ 
b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java
@@ -100,30 +100,8 @@ public class NotificationHookConsumerKafkaTest {
 produceMessage(new 
HookNotification.EntityCreateRequest("test_user1", createEntity()));
 
 NotificationConsumer consumer = 
createNewConsumer(kafkaNotification, false);
-NotificationHookConsumer notificationHookConsumer = new 
NotificationHookConsumer(notificationInterface, atlasEntityStore, serviceState, 
instanceConverter, typeRegistry);
-NotificationHookConsumer.HookConsumer hookConsumer = 
notificationHookConsumer.new HookConsumer(consumer);
-
-consumeOneMessage(consumer, hookConsumer);
-verify(atlasEntityStore).createOrUpdate(any(EntityStream.class), 
anyBoolean());
-
-// produce another message, and make sure it moves ahead. If 
commit succeeded, this would work.
-produceMessage(new 
HookNotification.EntityCreateRequest("test_user2", createEntity()));
-consumeOneMessage(consumer, hookConsumer);
-
verify(atlasEntityStore,times(2)).createOrUpdate(any(EntityStream.class), 
anyBoolean());
-reset(atlasEntityStore);
-}
-finally {
-kafkaNotification.close();
-}
-}
-
-@Test
-public void testConsumerConsumesNewMessageWithAutoCommitDisabled1() throws 
AtlasException, InterruptedException, AtlasBaseException {
-try {
-produceMessage(new 
HookNotification.EntityCreateRequest("test_user1", createEntity()));
-
-NotificationConsumer consumer = 
createNewConsumer(kafkaNotification, false);
-NotificationHookConsumer notificationHookConsumer = new 
NotificationHookConsumer(notificationInterface, atlasEntityStore, serviceState, 
instanceConverter, typeRegistry);
+NotificationHookConsumer notificationHookConsumer =
+new NotificationHookConsumer(notificationInterface, 
atlasEntityStore, serviceState, instanceConverter, typeRegistry);
 NotificationHookConsumer.HookConsumer hookConsumer = 
notificationHookConsumer.new HookConsumer(consumer);
 
 consumeOneMessage(consumer, hookConsumer);



[1/3] atlas git commit: ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a datatype

2017-08-16 Thread madhan
Repository: atlas
Updated Branches:
  refs/heads/0.8-incubating b993f9227 -> 374cc342d


ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a 
datatype

Signed-off-by: Madhan Neethiraj 
(cherry picked from commit fa11d13a5c431fe3c46a7ad2b267bea1f61da3e9)


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

Branch: refs/heads/0.8-incubating
Commit: 0d6f7a4faa9c1066196473704bc125ef4bdd50de
Parents: b993f92
Author: kevalbhatt 
Authored: Wed Aug 16 16:02:06 2017 +0530
Committer: Madhan Neethiraj 
Committed: Wed Aug 16 11:14:31 2017 -0700

--
 .../js/views/search/SearchResultLayoutView.js   | 76 ++--
 1 file changed, 38 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/0d6f7a4f/dashboardv2/public/js/views/search/SearchResultLayoutView.js
--
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js 
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index b9a8895..072295e 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -637,48 +637,48 @@ define(['require',
 }
 })
 };
-if (this.value && this.value.searchType === "basic") {
-var def = 
this.entityDefCollection.fullCollection.find({ name: this.value.type });
-if (def) {
-var attrObj = Utils.getNestedSuperTypeObj({ data: 
def.toJSON(), collection: this.entityDefCollection, attrMerge: true });
-_.each(attrObj, function(obj, key) {
-var key = obj.name,
-isRenderable = _.contains(columnToShow, 
key)
-if (key == "name" || key == "description" || 
key == "owner") {
-if (columnToShow) {
-col[key].renderable = isRenderable;
-}
-return;
+}
+if (this.value && this.value.searchType === "basic") {
+var def = this.entityDefCollection.fullCollection.find({ 
name: this.value.type });
+if (def) {
+var attrObj = Utils.getNestedSuperTypeObj({ data: 
def.toJSON(), collection: this.entityDefCollection, attrMerge: true });
+_.each(attrObj, function(obj, key) {
+var key = obj.name,
+isRenderable = _.contains(columnToShow, key)
+if (key == "name" || key == "description" || key 
== "owner") {
+if (columnToShow) {
+col[key].renderable = isRenderable;
 }
-col[obj.name] = {
-label: obj.name.capitalize(),
-cell: "Html",
-editable: false,
-sortable: false,
-resizeable: true,
-orderable: true,
-renderable: isRenderable,
-formatter: _.extend({}, 
Backgrid.CellFormatter.prototype, {
-fromRaw: function(rawValue, model) {
-var modelObj = model.toJSON();
-
-if (modelObj && 
modelObj.attributes && !_.isUndefined(modelObj.attributes[key])) {
-var tempObj = {
-'scope': that,
-'attributeDefs': [obj],
-'valueObject': {},
-'isTable': false
-}
+return;
+}
+col[obj.name] = {
+label: obj.name.capitalize(),
+cell: "Html",
+editable: false,
+sortable: false,
+  

[3/3] atlas git commit: ATLAS-1867 ATLASClientV2 correct delete typedefs expected http code

2017-08-16 Thread madhan
ATLAS-1867 ATLASClientV2 correct delete typedefs expected http code

Signed-off-by: David Radley 
(cherry picked from commit 376298540ceca9315d3726c9dbaab619d33ea4f7)


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

Branch: refs/heads/0.8-incubating
Commit: 374cc342daf1982145b3c36788fb972682bc6d35
Parents: bd5f74b
Author: Richard Ding 
Authored: Wed Aug 16 10:36:00 2017 +0100
Committer: Madhan Neethiraj 
Committed: Wed Aug 16 11:15:59 2017 -0700

--
 client/src/main/java/org/apache/atlas/AtlasClientV2.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/374cc342/client/src/main/java/org/apache/atlas/AtlasClientV2.java
--
diff --git a/client/src/main/java/org/apache/atlas/AtlasClientV2.java 
b/client/src/main/java/org/apache/atlas/AtlasClientV2.java
index 1353357..2cb9e84 100644
--- a/client/src/main/java/org/apache/atlas/AtlasClientV2.java
+++ b/client/src/main/java/org/apache/atlas/AtlasClientV2.java
@@ -67,7 +67,7 @@ public class AtlasClientV2 extends AtlasBaseClient {
 private static final APIInfo GET_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, 
HttpMethod.GET, Response.Status.OK);
 private static final APIInfo CREATE_ALL_TYPE_DEFS = new 
APIInfo(TYPEDEFS_API, HttpMethod.POST, Response.Status.OK);
 private static final APIInfo UPDATE_ALL_TYPE_DEFS = new 
APIInfo(TYPEDEFS_API, HttpMethod.PUT, Response.Status.OK);
-private static final APIInfo DELETE_ALL_TYPE_DEFS = new 
APIInfo(TYPEDEFS_API, HttpMethod.DELETE, Response.Status.OK);
+private static final APIInfo DELETE_ALL_TYPE_DEFS = new 
APIInfo(TYPEDEFS_API, HttpMethod.DELETE, Response.Status.NO_CONTENT);
 
 // Entity APIs
 public static final String ENTITY_API = BASE_URI + "v2/entity/";
@@ -278,7 +278,7 @@ public class AtlasClientV2 extends AtlasBaseClient {
  * @param typesDef A composite object that captures all types to be deleted
  */
 public void deleteAtlasTypeDefs(final AtlasTypesDef typesDef) throws 
AtlasServiceException {
-callAPI(DELETE_ALL_TYPE_DEFS, AtlasTypesDef.class, 
AtlasType.toJson(typesDef));
+callAPI(DELETE_ALL_TYPE_DEFS, (Class)null, 
AtlasType.toJson(typesDef));
 }
 
 /* Lineage Calls  */



atlas git commit: ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a datatype

2017-08-16 Thread madhan
Repository: atlas
Updated Branches:
  refs/heads/master 376298540 -> fa11d13a5


ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a 
datatype

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/fa11d13a
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/fa11d13a
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/fa11d13a

Branch: refs/heads/master
Commit: fa11d13a5c431fe3c46a7ad2b267bea1f61da3e9
Parents: 3762985
Author: kevalbhatt 
Authored: Wed Aug 16 16:02:06 2017 +0530
Committer: Madhan Neethiraj 
Committed: Wed Aug 16 10:32:50 2017 -0700

--
 .../js/views/search/SearchResultLayoutView.js   | 76 ++--
 1 file changed, 38 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/fa11d13a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
--
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js 
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index b9a8895..072295e 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -637,48 +637,48 @@ define(['require',
 }
 })
 };
-if (this.value && this.value.searchType === "basic") {
-var def = 
this.entityDefCollection.fullCollection.find({ name: this.value.type });
-if (def) {
-var attrObj = Utils.getNestedSuperTypeObj({ data: 
def.toJSON(), collection: this.entityDefCollection, attrMerge: true });
-_.each(attrObj, function(obj, key) {
-var key = obj.name,
-isRenderable = _.contains(columnToShow, 
key)
-if (key == "name" || key == "description" || 
key == "owner") {
-if (columnToShow) {
-col[key].renderable = isRenderable;
-}
-return;
+}
+if (this.value && this.value.searchType === "basic") {
+var def = this.entityDefCollection.fullCollection.find({ 
name: this.value.type });
+if (def) {
+var attrObj = Utils.getNestedSuperTypeObj({ data: 
def.toJSON(), collection: this.entityDefCollection, attrMerge: true });
+_.each(attrObj, function(obj, key) {
+var key = obj.name,
+isRenderable = _.contains(columnToShow, key)
+if (key == "name" || key == "description" || key 
== "owner") {
+if (columnToShow) {
+col[key].renderable = isRenderable;
 }
-col[obj.name] = {
-label: obj.name.capitalize(),
-cell: "Html",
-editable: false,
-sortable: false,
-resizeable: true,
-orderable: true,
-renderable: isRenderable,
-formatter: _.extend({}, 
Backgrid.CellFormatter.prototype, {
-fromRaw: function(rawValue, model) {
-var modelObj = model.toJSON();
-
-if (modelObj && 
modelObj.attributes && !_.isUndefined(modelObj.attributes[key])) {
-var tempObj = {
-'scope': that,
-'attributeDefs': [obj],
-'valueObject': {},
-'isTable': false
-}
+return;
+}
+col[obj.name] = {
+label: obj.name.capitalize(),
+cell: "Html",
+editable: false,
+sortable: false,
+resizeable: true,
+orderable: 

atlas git commit: ATLAS-1867 ATLASClientV2 correct delete typedefs expected http code

2017-08-16 Thread davidrad
Repository: atlas
Updated Branches:
  refs/heads/master 856a0c61b -> 376298540


ATLAS-1867 ATLASClientV2 correct delete typedefs expected http code

Signed-off-by: David Radley 


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

Branch: refs/heads/master
Commit: 376298540ceca9315d3726c9dbaab619d33ea4f7
Parents: 856a0c6
Author: Richard Ding 
Authored: Wed Aug 16 10:36:00 2017 +0100
Committer: David Radley 
Committed: Wed Aug 16 10:36:00 2017 +0100

--
 client/src/main/java/org/apache/atlas/AtlasClientV2.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/37629854/client/src/main/java/org/apache/atlas/AtlasClientV2.java
--
diff --git a/client/src/main/java/org/apache/atlas/AtlasClientV2.java 
b/client/src/main/java/org/apache/atlas/AtlasClientV2.java
index 1353357..2cb9e84 100644
--- a/client/src/main/java/org/apache/atlas/AtlasClientV2.java
+++ b/client/src/main/java/org/apache/atlas/AtlasClientV2.java
@@ -67,7 +67,7 @@ public class AtlasClientV2 extends AtlasBaseClient {
 private static final APIInfo GET_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, 
HttpMethod.GET, Response.Status.OK);
 private static final APIInfo CREATE_ALL_TYPE_DEFS = new 
APIInfo(TYPEDEFS_API, HttpMethod.POST, Response.Status.OK);
 private static final APIInfo UPDATE_ALL_TYPE_DEFS = new 
APIInfo(TYPEDEFS_API, HttpMethod.PUT, Response.Status.OK);
-private static final APIInfo DELETE_ALL_TYPE_DEFS = new 
APIInfo(TYPEDEFS_API, HttpMethod.DELETE, Response.Status.OK);
+private static final APIInfo DELETE_ALL_TYPE_DEFS = new 
APIInfo(TYPEDEFS_API, HttpMethod.DELETE, Response.Status.NO_CONTENT);
 
 // Entity APIs
 public static final String ENTITY_API = BASE_URI + "v2/entity/";
@@ -278,7 +278,7 @@ public class AtlasClientV2 extends AtlasBaseClient {
  * @param typesDef A composite object that captures all types to be deleted
  */
 public void deleteAtlasTypeDefs(final AtlasTypesDef typesDef) throws 
AtlasServiceException {
-callAPI(DELETE_ALL_TYPE_DEFS, AtlasTypesDef.class, 
AtlasType.toJson(typesDef));
+callAPI(DELETE_ALL_TYPE_DEFS, (Class)null, 
AtlasType.toJson(typesDef));
 }
 
 /* Lineage Calls  */