Syncope-2_0_X - Build # 59 - Still Failing

2017-07-27 Thread Apache Jenkins Server
The Apache Jenkins build system has built Syncope-2_0_X (build #59)

Status: Still Failing

Check console output at https://builds.apache.org/job/Syncope-2_0_X/59/ to view 
the results.

Syncope-master-deploy - Build # 2389 - Failure

2017-07-27 Thread Apache Jenkins Server
The Apache Jenkins build system has built Syncope-master-deploy (build #2389)

Status: Failure

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

syncope git commit: SYNCOPE-1174 - NPE in AccessTokenDataBinderImpl if no 'jwt.lifetime.minutes' schema is present

2017-07-27 Thread coheigea
Repository: syncope
Updated Branches:
  refs/heads/2_0_X fffee9f15 -> 6634daaee


SYNCOPE-1174 - NPE in AccessTokenDataBinderImpl if no 'jwt.lifetime.minutes' 
schema is present


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

Branch: refs/heads/2_0_X
Commit: 6634daaeebbe95fea9e1c104bc64d7b2e0d45e4b
Parents: fffee9f
Author: Colm O hEigeartaigh 
Authored: Thu Jul 27 16:47:35 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Jul 27 16:48:02 2017 +0100

--
 .../java/data/AccessTokenDataBinderImpl.java | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/6634daae/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
--
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
index 13a5b93..b415fb2 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
@@ -38,6 +38,7 @@ import 
org.apache.syncope.core.persistence.api.dao.AccessTokenDAO;
 import org.apache.syncope.core.persistence.api.dao.ConfDAO;
 import org.apache.syncope.core.persistence.api.entity.AccessToken;
 import org.apache.syncope.core.persistence.api.entity.EntityFactory;
+import org.apache.syncope.core.persistence.api.entity.conf.CPlainAttr;
 import org.apache.syncope.core.provisioning.api.data.AccessTokenDataBinder;
 import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
 import org.apache.syncope.core.spring.BeanUtils;
@@ -124,9 +125,17 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 }
 
 if (replaceExisting || body == null) {
+int duration = 120;
+CPlainAttr jwtLifetimeMins = confDAO.find("jwt.lifetime.minutes", 
"120");
+if (jwtLifetimeMins != null) {
+duration = 
jwtLifetimeMins.getValues().get(0).getLongValue().intValue();
+} else {
+LOG.warn("No schema found for 'jwt.lifetime.minutes'. Using 
default value of '120'");
+}
+
 Triple created = generateJWT(
 subject,
-confDAO.find("jwt.lifetime.minutes", 
"120").getValues().get(0).getLongValue().intValue(),
+duration,
 claims);
 
 body = created.getMiddle();



syncope git commit: SYNCOPE-1174 - NPE in AccessTokenDataBinderImpl if no 'jwt.lifetime.minutes' schema is present

2017-07-27 Thread coheigea
Repository: syncope
Updated Branches:
  refs/heads/master aa11ac9b4 -> 64ef5bf18


SYNCOPE-1174 - NPE in AccessTokenDataBinderImpl if no 'jwt.lifetime.minutes' 
schema is present


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

Branch: refs/heads/master
Commit: 64ef5bf1800f699168f59fbd27be113c76cd0baa
Parents: aa11ac9
Author: Colm O hEigeartaigh 
Authored: Thu Jul 27 16:47:35 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Jul 27 16:47:35 2017 +0100

--
 .../java/data/AccessTokenDataBinderImpl.java | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/64ef5bf1/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
--
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
index 13a5b93..b415fb2 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AccessTokenDataBinderImpl.java
@@ -38,6 +38,7 @@ import 
org.apache.syncope.core.persistence.api.dao.AccessTokenDAO;
 import org.apache.syncope.core.persistence.api.dao.ConfDAO;
 import org.apache.syncope.core.persistence.api.entity.AccessToken;
 import org.apache.syncope.core.persistence.api.entity.EntityFactory;
+import org.apache.syncope.core.persistence.api.entity.conf.CPlainAttr;
 import org.apache.syncope.core.provisioning.api.data.AccessTokenDataBinder;
 import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
 import org.apache.syncope.core.spring.BeanUtils;
@@ -124,9 +125,17 @@ public class AccessTokenDataBinderImpl implements 
AccessTokenDataBinder {
 }
 
 if (replaceExisting || body == null) {
+int duration = 120;
+CPlainAttr jwtLifetimeMins = confDAO.find("jwt.lifetime.minutes", 
"120");
+if (jwtLifetimeMins != null) {
+duration = 
jwtLifetimeMins.getValues().get(0).getLongValue().intValue();
+} else {
+LOG.warn("No schema found for 'jwt.lifetime.minutes'. Using 
default value of '120'");
+}
+
 Triple created = generateJWT(
 subject,
-confDAO.find("jwt.lifetime.minutes", 
"120").getValues().get(0).getLongValue().intValue(),
+duration,
 claims);
 
 body = created.getMiddle();



Syncope-2_0_X - Build # 58 - Still Failing

2017-07-27 Thread Apache Jenkins Server
The Apache Jenkins build system has built Syncope-2_0_X (build #58)

Status: Still Failing

Check console output at https://builds.apache.org/job/Syncope-2_0_X/58/ to view 
the results.

[1/2] syncope git commit: SYNCOPE-1173 - Replace List dynGroups with List dynMemberships

2017-07-27 Thread coheigea
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 4a9964872 -> fffee9f15


SYNCOPE-1173 - Replace List dynGroups with List 
dynMemberships


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

Branch: refs/heads/2_0_X
Commit: 025441a36cf89f02b1b82e0ea617daa27b2ce9ac
Parents: 4a99648
Author: Colm O hEigeartaigh 
Authored: Wed Jul 26 16:36:29 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Jul 27 11:14:22 2017 +0100

--
 .../client/console/wizards/any/Groups.java  |  4 +-
 .../syncope/common/lib/to/AnyObjectTO.java  | 12 +++---
 .../common/lib/to/GroupableRelatableTO.java |  2 +-
 .../apache/syncope/common/lib/to/UserTO.java| 12 +++---
 .../test/resources/domains/MasterContent.xml|  8 ++--
 .../java/data/AnyObjectDataBinderImpl.java  | 14 ++-
 .../java/data/UserDataBinderImpl.java   | 15 +--
 .../apache/syncope/fit/core/GroupITCase.java| 42 +---
 .../org/apache/syncope/fit/core/RoleITCase.java |  2 +-
 .../syncope/fit/core/UserIssuesITCase.java  |  5 ++-
 10 files changed, 74 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/025441a3/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 8e640fd..499bc26 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
@@ -313,8 +313,8 @@ public class Groups extends WizardStep implements 
ICondition {
 GroupFiqlSearchConditionBuilder searchConditionBuilder = 
SyncopeClient.getGroupSearchConditionBuilder();
 
 ArrayList conditions = new ArrayList<>();
-for (String groupKey : 
GroupableRelatableTO.class.cast(anyTO).getDynGroups()) {
-
conditions.add(searchConditionBuilder.is("key").equalTo(groupKey).wrap());
+for (MembershipTO membership : 
GroupableRelatableTO.class.cast(anyTO).getDynMemberships()) {
+
conditions.add(searchConditionBuilder.is("key").equalTo(membership.getGroupKey()).wrap());
 }
 
 Map assignedGroups = new HashMap<>();

http://git-wip-us.apache.org/repos/asf/syncope/blob/025441a3/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java
--
diff --git 
a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java 
b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java
index 231504b..af8b0ea 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/AnyObjectTO.java
@@ -41,7 +41,7 @@ public class AnyObjectTO extends AnyTO implements 
GroupableRelatableTO {
 
 private final List memberships = new ArrayList<>();
 
-private final List dynGroups = new ArrayList<>();
+private final List dynMemberships = new ArrayList<>();
 
 public String getName() {
 return name;
@@ -91,11 +91,11 @@ public class AnyObjectTO extends AnyTO implements 
GroupableRelatableTO {
 return memberships;
 }
 
-@XmlElementWrapper(name = "dynGroups")
-@XmlElement(name = "role")
-@JsonProperty("dynGroups")
+@XmlElementWrapper(name = "dynMemberships")
+@XmlElement(name = "dynMembership")
+@JsonProperty("dynMemberships")
 @Override
-public List getDynGroups() {
-return dynGroups;
+public List getDynMemberships() {
+return dynMemberships;
 }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/025441a3/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupableRelatableTO.java
--
diff --git 
a/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupableRelatableTO.java
 
b/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupableRelatableTO.java
index 0dba26d..f2b8dbc 100644
--- 
a/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupableRelatableTO.java
+++ 
b/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupableRelatableTO.java
@@ -26,7 +26,7 @@ public interface GroupableRelatableTO {
 
 List getMemberships();
 
-   

[2/2] syncope git commit: Removing Java 8 idioms

2017-07-27 Thread coheigea
Removing Java 8 idioms


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

Branch: refs/heads/2_0_X
Commit: fffee9f15d2a7dfdc49524e983e1cb0d9254271f
Parents: 025441a
Author: Colm O hEigeartaigh 
Authored: Thu Jul 27 12:46:35 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Jul 27 12:46:35 2017 +0100

--
 .../apache/syncope/fit/core/GroupITCase.java| 65 +---
 .../syncope/fit/core/UserIssuesITCase.java  | 12 +++-
 2 files changed, 69 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/fffee9f1/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java
--
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java
index 9d833cc..fe9129d 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/GroupITCase.java
@@ -38,6 +38,8 @@ import javax.naming.directory.SearchResult;
 import javax.ws.rs.ForbiddenException;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
+
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.collections4.Predicate;
 import org.apache.commons.lang3.SerializationUtils;
@@ -652,7 +654,14 @@ public class GroupITCase extends AbstractITCase {
 
 List memberships = userService.read(
 "c9b2dec2-00a7-4855-97c0-d854842b4b24").getDynMemberships();
-assertTrue(memberships.stream().anyMatch(m -> 
m.getGroupKey().equals(groupKey)));
+assertFalse(CollectionUtils.select(memberships, new 
Predicate() {
+
+public boolean evaluate(MembershipTO object) {
+return object.getGroupKey().equals(groupKey);
+}
+
+
+}).isEmpty());
 
 GroupPatch patch = new GroupPatch();
 patch.setKey(group.getKey());
@@ -683,14 +692,35 @@ public class GroupITCase extends AbstractITCase {
 assertNotNull(newAny.getPlainAttr("location"));
 List memberships = anyObjectService.read(
 "fc6dbc3a-6c07-4965-8781-921e7401a4a5").getDynMemberships();
-assertTrue(memberships.stream().anyMatch(m -> 
m.getGroupKey().equals(groupKey)));
+assertFalse(CollectionUtils.select(memberships, new 
Predicate() {
+
+public boolean evaluate(MembershipTO object) {
+return object.getGroupKey().equals(groupKey);
+}
+
+
+}).isEmpty());
 
 memberships = anyObjectService.read(
 "8559d14d-58c2-46eb-a2d4-a7d35161e8f8").getDynMemberships();
-assertTrue(memberships.stream().anyMatch(m -> 
m.getGroupKey().equals(groupKey)));
+assertFalse(CollectionUtils.select(memberships, new 
Predicate() {
+
+public boolean evaluate(MembershipTO object) {
+return object.getGroupKey().equals(groupKey);
+}
+
+
+}).isEmpty());
 
 memberships = 
anyObjectService.read(newAny.getKey()).getDynMemberships();
-assertTrue(memberships.stream().anyMatch(m -> 
m.getGroupKey().equals(groupKey)));
+assertFalse(CollectionUtils.select(memberships, new 
Predicate() {
+
+public boolean evaluate(MembershipTO object) {
+return object.getGroupKey().equals(groupKey);
+}
+
+
+}).isEmpty());
 
 // 2. update group and change aDynMembership condition
 fiql = 
SyncopeClient.getAnyObjectSearchConditionBuilder("PRINTER").is("location").nullValue().query();
@@ -717,12 +747,33 @@ public class GroupITCase extends AbstractITCase {
 
 memberships = anyObjectService.read(
 "fc6dbc3a-6c07-4965-8781-921e7401a4a5").getDynMemberships();
-assertFalse(memberships.stream().anyMatch(m -> 
m.getGroupKey().equals(groupKey)));
+assertTrue(CollectionUtils.select(memberships, new 
Predicate() {
+
+public boolean evaluate(MembershipTO object) {
+return object.getGroupKey().equals(groupKey);
+}
+
+
+}).isEmpty());
 memberships = anyObjectService.read(
 "8559d14d-58c2-46eb-a2d4-a7d35161e8f8").getDynMemberships();
-assertFalse(memberships.stream().anyMatch(m -> 
m.getGroupKey().equals(groupKey)));
+assertTrue(CollectionUtils.select(memberships, new 
Predicate() {
+
+public boolean 

[1/2] syncope git commit: Upgrading Spring, PDFBox and frontend-maven-plugin

2017-07-27 Thread ilgrosso
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 56d4e95b9 -> 4a9964872
  refs/heads/master dde0773f3 -> aa11ac9b4


Upgrading Spring, PDFBox and frontend-maven-plugin


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

Branch: refs/heads/2_0_X
Commit: 4a9964872a8db4329e6d2d8c1dbb00b4f60767ba
Parents: 56d4e95
Author: Francesco Chicchiriccò 
Authored: Thu Jul 27 09:40:48 2017 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Jul 27 09:40:48 2017 +0200

--
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/4a996487/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a62156f..8cf2787 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,7 +357,7 @@ under the License.
 
 2.8.9
 
-4.3.9.RELEASE
+4.3.10.RELEASE
 4.2.3.RELEASE
 
 2.4.2
@@ -1313,7 +1313,7 @@ under the License.
   
 org.apache.pdfbox
 pdfbox
-2.0.6
+2.0.7
   
   
   
@@ -1944,7 +1944,7 @@ under the License.
 
   com.github.eirslett
   frontend-maven-plugin
-  1.4
+  1.5
 
 
   org.codehaus.mojo