Syncope-master-deploy - Build # 2614 - Fixed

2017-10-17 Thread Apache Jenkins Server
The Apache Jenkins build system has built Syncope-master-deploy (build #2614)

Status: Fixed

Check console output at 
https://builds.apache.org/job/Syncope-master-deploy/2614/ to view the results.

[1/2] syncope git commit: Small checks

2017-10-17 Thread ilgrosso
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 482a881ff -> 2d853137d
  refs/heads/master dd152d87d -> b59af7276


Small checks


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

Branch: refs/heads/2_0_X
Commit: 2d853137df6608345d9b13a40c578f86427517bb
Parents: 482a881
Author: Francesco Chicchiriccò 
Authored: Tue Oct 17 18:11:20 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Tue Oct 17 18:11:20 2017 +0200

--
 .../syncope/core/provisioning/java/MappingManagerImpl.java   | 4 +++-
 .../syncope/core/rest/cxf/service/ResourceServiceImpl.java   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/2d853137/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
--
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
index 571aacc..40ebcd1 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
@@ -178,7 +178,9 @@ public class MappingManagerImpl implements MappingManager {
 values.addAll(alreadyAdded.getValue());
 }
 
-values.addAll(preparedAttr.getRight().getValue());
+if (preparedAttr.getRight().getValue() != null) {
+
values.addAll(preparedAttr.getRight().getValue());
+}
 
 
attributes.add(AttributeBuilder.build(preparedAttr.getRight().getName(), 
values));
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/2d853137/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
--
diff --git 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
index ed0df7c..2b76dfc 100644
--- 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
+++ 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
@@ -130,6 +130,7 @@ public class ResourceServiceImpl extends 
AbstractServiceImpl implements Resource
 if (StringUtils.isNotBlank(result.getPagedResultsCookie())) {
 result.setNext(builder.
 replaceQueryParam(PARAM_CONNID_PAGED_RESULTS_COOKIE, 
result.getPagedResultsCookie()).
+replaceQueryParam(PARAM_SIZE, listQuery.getSize()).
 build());
 }
 



[2/2] syncope git commit: Small checks

2017-10-17 Thread ilgrosso
Small checks


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

Branch: refs/heads/master
Commit: b59af727695281420bf75136253f142d0b29f18a
Parents: dd152d8
Author: Francesco Chicchiriccò 
Authored: Tue Oct 17 18:11:20 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Tue Oct 17 18:11:27 2017 +0200

--
 .../syncope/core/provisioning/java/MappingManagerImpl.java   | 4 +++-
 .../syncope/core/rest/cxf/service/ResourceServiceImpl.java   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/b59af727/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
--
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
index 640aaba..a19d37f 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java
@@ -177,7 +177,9 @@ public class MappingManagerImpl implements MappingManager {
 values.addAll(alreadyAdded.getValue());
 }
 
-values.addAll(preparedAttr.getRight().getValue());
+if (preparedAttr.getRight().getValue() != null) {
+
values.addAll(preparedAttr.getRight().getValue());
+}
 
 
attributes.add(AttributeBuilder.build(preparedAttr.getRight().getName(), 
values));
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/b59af727/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
--
diff --git 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
index ed0df7c..2b76dfc 100644
--- 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
+++ 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
@@ -130,6 +130,7 @@ public class ResourceServiceImpl extends 
AbstractServiceImpl implements Resource
 if (StringUtils.isNotBlank(result.getPagedResultsCookie())) {
 result.setNext(builder.
 replaceQueryParam(PARAM_CONNID_PAGED_RESULTS_COOKIE, 
result.getPagedResultsCookie()).
+replaceQueryParam(PARAM_SIZE, listQuery.getSize()).
 build());
 }
 



[1/4] syncope git commit: Fixing sample entitlements list

2017-10-17 Thread ilgrosso
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 6c9018fff -> 482a881ff
  refs/heads/master 1d74b79c2 -> dd152d87d


Fixing sample entitlements list


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

Branch: refs/heads/2_0_X
Commit: 6fbd41a2c80bf4ca2e4b1df8a917b312790e4cac
Parents: 6c9018f
Author: Francesco Chicchiriccò 
Authored: Tue Oct 17 15:55:44 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Tue Oct 17 15:55:44 2017 +0200

--
 src/main/asciidoc/reference-guide/concepts/roles.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/6fbd41a2/src/main/asciidoc/reference-guide/concepts/roles.adoc
--
diff --git a/src/main/asciidoc/reference-guide/concepts/roles.adoc 
b/src/main/asciidoc/reference-guide/concepts/roles.adoc
index 63949f4..f45c0a1 100644
--- a/src/main/asciidoc/reference-guide/concepts/roles.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/roles.adoc
@@ -95,10 +95,10 @@ For example, the following entitlements are normally 
required to be granted for
 `USER_CREATE`, `USER_UPDATE` and `USER_DELETE`:
 
 . `USER_SEARCH`
-. `USER_LIST`
 . `ANYTYPECLASS_READ`
 . `ANYTYPE_LIST`
 . `ANYTYPECLASS_LIST`
+. `RELATIONSHIPTYPE_LIST`
 . `USER_READ`
 . `ANYTYPE_READ`
 . `REALM_LIST`



[2/4] syncope git commit: Whitenoise

2017-10-17 Thread ilgrosso
Whitenoise


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

Branch: refs/heads/2_0_X
Commit: 482a881ff6cf136fccf72aa1b877ab0a9cfd490e
Parents: 6fbd41a
Author: Francesco Chicchiriccò 
Authored: Tue Oct 17 15:55:52 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Tue Oct 17 15:55:52 2017 +0200

--
 .../core/provisioning/java/data/TaskDataBinderImpl.java  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/482a881f/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
--
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
index a22db75..c2e655d 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
@@ -126,14 +126,14 @@ public class TaskDataBinderImpl implements TaskDataBinder 
{
 ? UnmatchingRule.ASSIGN : pushTaskTO.getUnmatchingRule());
 
 for (Map.Entry entry : 
pushTaskTO.getFilters().entrySet()) {
-AnyType type = anyTypeDAO.find(entry.getKey());
-if (type == null) {
+AnyType anyType = anyTypeDAO.find(entry.getKey());
+if (anyType == null) {
 LOG.debug("Invalid AnyType {} specified, ignoring...", 
entry.getKey());
 } else {
-PushTaskAnyFilter filter = pushTask.getFilter(type);
+PushTaskAnyFilter filter = pushTask.getFilter(anyType);
 if (filter == null) {
 filter = 
entityFactory.newEntity(PushTaskAnyFilter.class);
-filter.setAnyType(anyTypeDAO.find(entry.getKey()));
+filter.setAnyType(anyType);
 filter.setPushTask(pushTask);
 pushTask.add(filter);
 }



[4/4] syncope git commit: Whitenoise

2017-10-17 Thread ilgrosso
Whitenoise


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

Branch: refs/heads/master
Commit: dd152d87dfa21770c77d902dee759899214a6aed
Parents: 13ab04c
Author: Francesco Chicchiriccò 
Authored: Tue Oct 17 15:55:52 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Tue Oct 17 15:58:04 2017 +0200

--
 .../core/provisioning/java/data/TaskDataBinderImpl.java  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/dd152d87/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
--
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
index e469d66..5009e5b 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java
@@ -141,14 +141,14 @@ public class TaskDataBinderImpl implements TaskDataBinder 
{
 ? UnmatchingRule.ASSIGN : pushTaskTO.getUnmatchingRule());
 
 pushTaskTO.getFilters().entrySet().forEach(entry -> {
-AnyType type = anyTypeDAO.find(entry.getKey());
-if (type == null) {
+AnyType anyType = anyTypeDAO.find(entry.getKey());
+if (anyType == null) {
 LOG.debug("Invalid AnyType {} specified, ignoring...", 
entry.getKey());
 } else {
-PushTaskAnyFilter filter = 
pushTask.getFilter(type).orElse(null);
+PushTaskAnyFilter filter = 
pushTask.getFilter(anyType).orElse(null);
 if (filter == null) {
 filter = 
entityFactory.newEntity(PushTaskAnyFilter.class);
-filter.setAnyType(anyTypeDAO.find(entry.getKey()));
+filter.setAnyType(anyType);
 filter.setPushTask(pushTask);
 pushTask.add(filter);
 }



[3/4] syncope git commit: Fixing sample entitlements list

2017-10-17 Thread ilgrosso
Fixing sample entitlements list


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

Branch: refs/heads/master
Commit: 13ab04c345e34b53d54fedc2f67bf333be3dca46
Parents: 1d74b79
Author: Francesco Chicchiriccò 
Authored: Tue Oct 17 15:55:44 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Tue Oct 17 15:56:02 2017 +0200

--
 src/main/asciidoc/reference-guide/concepts/roles.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/13ab04c3/src/main/asciidoc/reference-guide/concepts/roles.adoc
--
diff --git a/src/main/asciidoc/reference-guide/concepts/roles.adoc 
b/src/main/asciidoc/reference-guide/concepts/roles.adoc
index 63949f4..f45c0a1 100644
--- a/src/main/asciidoc/reference-guide/concepts/roles.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/roles.adoc
@@ -95,10 +95,10 @@ For example, the following entitlements are normally 
required to be granted for
 `USER_CREATE`, `USER_UPDATE` and `USER_DELETE`:
 
 . `USER_SEARCH`
-. `USER_LIST`
 . `ANYTYPECLASS_READ`
 . `ANYTYPE_LIST`
 . `ANYTYPECLASS_LIST`
+. `RELATIONSHIPTYPE_LIST`
 . `USER_READ`
 . `ANYTYPE_READ`
 . `REALM_LIST`



[1/2] syncope git commit: [SYNCOPE-1138] Replacing left and right with otherEnd

2017-10-17 Thread ilgrosso
Repository: syncope
Updated Branches:
  refs/heads/2_0_X c9354a517 -> 6c9018fff
  refs/heads/master fdc991aa6 -> 1d74b79c2


[SYNCOPE-1138] Replacing left and right with otherEnd


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

Branch: refs/heads/2_0_X
Commit: 6c9018fff5c6353a9a7eab3338ba7d691685209c
Parents: c9354a5
Author: Francesco Chicchiriccò 
Authored: Tue Oct 17 09:50:02 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Tue Oct 17 09:50:02 2017 +0200

--
 .../console/wizards/any/AbstractAttrs.java  |  2 +-
 .../client/console/wizards/any/Groups.java  |  8 ++--
 .../console/wizards/any/Relationships.java  | 37 ---
 .../any/Relationships$Specification.html|  2 +-
 .../app/js/controllers/UserController.js|  4 +-
 .../resources/app/js/directives/groups.js   |  4 +-
 .../resources/app/js/filters/propsFilter.js | 11 +++--
 .../META-INF/resources/app/views/groups.html|  2 +-
 .../syncope/common/lib/EntityTOUtils.java   |  4 +-
 .../syncope/common/lib/to/AnyObjectTO.java  |  4 +-
 .../common/lib/to/GroupableRelatableTO.java |  2 +-
 .../syncope/common/lib/to/MembershipTO.java | 35 ---
 .../syncope/common/lib/to/RelationshipTO.java   | 28 ++--
 .../apache/syncope/common/lib/to/UserTO.java|  6 +--
 .../core/persistence/api/dao/AnyObjectDAO.java  |  5 ++-
 .../persistence/jpa/dao/JPAAnyObjectDAO.java| 27 ---
 .../jpa/entity/AbstractGroupableRelatable.java  | 13 --
 .../jpa/entity/anyobject/JPAAnyObject.java  | 17 +++
 .../persistence/jpa/entity/user/JPAUser.java| 15 +++
 .../test/resources/domains/MasterContent.xml|  2 +-
 .../java/data/AbstractAnyDataBinder.java|  7 +--
 .../java/data/AnyObjectDataBinderImpl.java  | 47 +++-
 .../java/data/UserDataBinderImpl.java   | 19 
 .../java/job/report/UserReportlet.java  | 10 ++---
 .../provisioning/java/utils/TemplateUtils.java  |  2 +-
 .../client/ElasticsearchUtils.java  |  4 +-
 .../syncope/fit/core/AnyObjectITCase.java   |  2 +-
 .../apache/syncope/fit/core/PullTaskITCase.java |  2 +-
 .../syncope/fit/core/UserWorkflowITCase.java|  4 +-
 29 files changed, 171 insertions(+), 154 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/6c9018ff/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index 334a97f..75ca867 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -215,7 +215,7 @@ public abstract class AbstractAttrs extends WizardSt
 
 protected List getMembershipAuxClasses(final MembershipTO 
membershipTO, final String anyType) {
 try {
-final GroupTO groupTO = 
groupRestClient.read(membershipTO.getRightKey());
+final GroupTO groupTO = 
groupRestClient.read(membershipTO.getGroupKey());
 return groupTO.getTypeExtension(anyType).getAuxClasses();
 } catch (Exception e) {
 return Collections.emptyList();

http://git-wip-us.apache.org/repos/asf/syncope/blob/6c9018ff/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
index 499bc26..2c28a23 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/Groups.java
@@ -155,7 +155,7 @@ public class Groups extends WizardStep implements 
ICondition {
 : groupRestClient.search(
 anyTO.getRealm(),
 
SyncopeClient.getGroupSearchConditionBuilder().
-
isAssignable().and().is("name").equalTo(filter).query(),
+
isAssignable().and().is("name").equalTo(filter).query(),