[1/2] syncope git commit: Upgrading Spring and Spring Security

2018-04-05 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/master 51c60a7a1 -> 0418b4578


Upgrading Spring and Spring Security


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

Branch: refs/heads/master
Commit: 0418b4578388227f92d2e86a9c50b4a267d53465
Parents: a227c9e
Author: Francesco Chicchiriccò 
Authored: Thu Apr 5 17:24:50 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Apr 5 17:24:57 2018 +0200

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/0418b457/pom.xml
--
diff --git a/pom.xml b/pom.xml
index b98c6b9..55c38f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,8 +370,8 @@ under the License.
 
 2.9.5
 
-5.0.4.RELEASE
-5.0.3.RELEASE
+5.0.5.RELEASE
+5.0.4.RELEASE
 
 3.0.0-SNAPSHOT
 3.0.0

[2/2] syncope git commit: Upgrading to Flowable 6.3.0 (and its new Modeler)

2018-04-05 Thread ilgrosso 
Upgrading to Flowable 6.3.0 (and its new Modeler)


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

Branch: refs/heads/master
Commit: a227c9ea61d8c3f549133e8ee5719bb080d529ce
Parents: 51c60a7
Author: Francesco Chicchiriccò 
Authored: Thu Apr 5 16:54:15 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Apr 5 17:24:57 2018 +0200

--
 archetype/pom.xml   |   1 +
 .../archetype-resources/console/pom.xml |  31 +++-
 fit/console-reference/pom.xml   |  31 +++-
 .../src/main/resources/app-cfg.js   |  36 ++--
 .../src/main/resources/toolbar.js   | 181 +++
 .../src/main/resources/url-config.js|  50 +++--
 .../syncope/installer/files/ConsolePom.java |  42 -
 pom.xml |   2 +-
 8 files changed, 314 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/archetype/pom.xml
--
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 87fe06f..c4639be 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -240,6 +240,7 @@ under the License.
   save-model.html
   app-cfg.js
   url-config.js
+  toolbar.js
 
   
   

http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/archetype/src/main/resources/archetype-resources/console/pom.xml
--
diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml 
b/archetype/src/main/resources/archetype-resources/console/pom.xml
index da2018f..401387e 100644
--- a/archetype/src/main/resources/archetype-resources/console/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/console/pom.xml
@@ -167,7 +167,12 @@ under the License.
 
   
 
+   dest="${flowable-modeler.directory}">
+  
+
+
+  
+
 
 
@@ -176,19 +181,41 @@ under the License.
   
 
 
+
+  
+
+  
+
+
+
 
+
+
+
+
 
-
+ 
 
 
+
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/fit/console-reference/pom.xml
--
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index bbd431d..c13b264 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -151,7 +151,12 @@ under the License.
 
   
 
+   dest="${flowable-modeler.directory}">
+  
+
+
+  
+
 
 
@@ -160,19 +165,41 @@ under the License.
   
 
 
+
+  
+
+  
+
+
+
 
+
+
+
+
 
-
+ 
 
 
+
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/a227c9ea/fit/console-reference/src/main/resources/app-cfg.js
--
diff --git a/fit/console-reference/src/main/resources/app-cfg.js 
b/fit/console-reference/src/main/resources/app-cfg.js
index 4c73c9c..15ec23a 100644
--- a/fit/console-reference/src/main/resources/app-cfg.js
+++ b/fit/console-reference/src/main/resources/app-cfg.js
@@ -1,20 +1,16 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of

syncope git commit: Upgrading Spring

2018-04-05 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/2_0_X bb508d9fa -> 241f17825


Upgrading Spring


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

Branch: refs/heads/2_0_X
Commit: 241f17825847f0872d146186c654b208b1d26e8e
Parents: bb508d9
Author: Francesco Chicchiriccò 
Authored: Thu Apr 5 16:55:35 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Apr 5 16:55:35 2018 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/241f1782/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 867e24a..414850c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,7 +370,7 @@ under the License.
 
 2.9.5
 
-4.3.14.RELEASE
+4.3.15.RELEASE
 4.2.5.RELEASE
 
 2.4.2

syncope git commit: [SYNCOPE-1288] Task lists are now correctly sortable

2018-04-05 Thread skylark17 
Repository: syncope
Updated Branches:
  refs/heads/master a8ae113d9 -> 51c60a7a1


[SYNCOPE-1288] Task lists are now correctly sortable


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

Branch: refs/heads/master
Commit: 51c60a7a134f7680b7f604f34b1a9c4acc5ddab6
Parents: a8ae113
Author: skylark17 
Authored: Thu Apr 5 15:59:48 2018 +0200
Committer: skylark17 
Committed: Thu Apr 5 16:39:18 2018 +0200

--
 .../console/reports/ReportDirectoryPanel.java   |   6 +-
 .../tasks/ProvisioningTaskDirectoryPanel.java   |   4 +-
 .../console/tasks/SchedTaskDirectoryPanel.java  |   4 +-
 .../core/persistence/jpa/dao/JPATaskDAO.java| 243 ---
 .../core/persistence/jpa/outer/TaskTest.java|  17 ++
 .../syncope/fit/core/PropagationTaskITCase.java |  77 ++
 6 files changed, 306 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/51c60a7a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
index 21b1563..5109da3 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
@@ -108,11 +108,11 @@ public abstract class ReportDirectoryPanel
 columns.add(new PropertyColumn<>(new StringResourceModel("name", 
this), "name", "name"));
 
 columns.add(new DatePropertyColumn<>(
-new StringResourceModel("lastExec", this), "lastExec", 
"lastExec"));
+new StringResourceModel("lastExec", this), null, "lastExec"));
 
 columns.add(new DatePropertyColumn<>(
-new StringResourceModel("nextExec", this), "nextExec", 
"nextExec"));
-
+new StringResourceModel("nextExec", this), null, "nextExec"));
+
 columns.add(new DatePropertyColumn<>(
 new StringResourceModel("start", this), "start", "start"));
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/51c60a7a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
index f7f0b2e..504e767 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
@@ -117,10 +117,10 @@ public abstract class ProvisioningTaskDirectoryPanel(
-new StringResourceModel("lastExec", this), "lastExec", 
"lastExec"));
+new StringResourceModel("lastExec", this), null, "lastExec"));
 
 columns.add(new DatePropertyColumn<>(
-new StringResourceModel("nextExec", this), "nextExec", 
"nextExec"));
+new StringResourceModel("nextExec", this), null, "nextExec"));
 
 columns.add(new PropertyColumn<>(
 new StringResourceModel("latestExecStatus", this), 
"latestExecStatus", "latestExecStatus"));

http://git-wip-us.apache.org/repos/asf/syncope/blob/51c60a7a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
index 824b778..bfc7eb6 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
@@ -161,10 +161,10 @@ public abstract class SchedTaskDirectoryPanel
 });
 
 columns.add(new DatePropertyColumn<>(
-new StringResourceModel("lastExec", this), "lastExec", 
"lastExec"));
+new StringResourceModel("lastExec", this), null, "lastExec"));

syncope git commit: [SYNCOPE-1288] Task lists are now correctly sortable

2018-04-05 Thread skylark17 
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 79354db35 -> bb508d9fa


[SYNCOPE-1288] Task lists are now correctly sortable


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

Branch: refs/heads/2_0_X
Commit: bb508d9faf3ba5ea85fc5a377e517dcd8b9476c6
Parents: 79354db
Author: skylark17 
Authored: Thu Apr 5 15:59:48 2018 +0200
Committer: skylark17 
Committed: Thu Apr 5 15:59:48 2018 +0200

--
 .../console/reports/ReportDirectoryPanel.java   |   4 +-
 .../tasks/ProvisioningTaskDirectoryPanel.java   |   4 +-
 .../console/tasks/SchedTaskDirectoryPanel.java  |   4 +-
 .../core/persistence/jpa/dao/JPATaskDAO.java| 243 ---
 .../core/persistence/jpa/outer/TaskTest.java| 127 +-
 .../syncope/fit/core/PropagationTaskITCase.java |  78 ++
 6 files changed, 361 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/bb508d9f/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
index e0c5d6f..ceef254 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
@@ -110,10 +110,10 @@ public abstract class ReportDirectoryPanel
 "name", this), "name", "name"));
 
 columns.add(new DatePropertyColumn(
-new StringResourceModel("lastExec", this), "lastExec", 
"lastExec"));
+new StringResourceModel("lastExec", this), null, "lastExec"));
 
 columns.add(new DatePropertyColumn(
-new StringResourceModel("nextExec", this), "nextExec", 
"nextExec"));
+new StringResourceModel("nextExec", this), null, "nextExec"));
 
 columns.add(new DatePropertyColumn(
 new StringResourceModel("start", this), "start", "start"));

http://git-wip-us.apache.org/repos/asf/syncope/blob/bb508d9f/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
index cacd6f7..59802b4 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
@@ -117,10 +117,10 @@ public abstract class ProvisioningTaskDirectoryPanel(
-new StringResourceModel("lastExec", this), "lastExec", 
"lastExec"));
+new StringResourceModel("lastExec", this), null, "lastExec"));
 
 columns.add(new DatePropertyColumn(
-new StringResourceModel("nextExec", this), "nextExec", 
"nextExec"));
+new StringResourceModel("nextExec", this), null, "nextExec"));
 
 columns.add(new PropertyColumn(
 new StringResourceModel("latestExecStatus", this), 
"latestExecStatus", "latestExecStatus"));

http://git-wip-us.apache.org/repos/asf/syncope/blob/bb508d9f/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
index a4b2d51..a57856a 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
@@ -164,10 +164,10 @@ public abstract class SchedTaskDirectoryPanel
 });
 
 columns.add(new DatePropertyColumn(
-new StringResourceModel("lastExec", this), "lastExec", 
"lastExec"));
+new StringResourceModel("lastExec", this), null, "lastExec"));
 
 columns.add(new DatePropertyColumn(
-new

Syncope-1_2_X-deploy - Build # 109 - Aborted

2018-04-05 Thread Apache Jenkins Server 
The Apache Jenkins build system has built Syncope-1_2_X-deploy (build #109)

Status: Aborted

Check console output at https://builds.apache.org/job/Syncope-1_2_X-deploy/109/ 
to view the results.

syncope git commit: [SYNCOPE-1293] Explicitly allow token Vs comparison

2018-04-05 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/1_2_X 1ed1bee11 -> 80d7e53cc


[SYNCOPE-1293] Explicitly allow token Vs  comparison


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

Branch: refs/heads/1_2_X
Commit: 80d7e53cc9905765fe641a92bb4e8d83cd852c68
Parents: 1ed1bee
Author: Francesco Chicchiriccò 
Authored: Thu Apr 5 11:17:59 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Apr 5 11:17:59 2018 +0200

--
 .../syncope/core/rest/data/SearchCondVisitor.java | 14 ++
 .../apache/syncope/core/rest/UserSelfTestITCase.java  |  8 
 2 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/80d7e53c/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
--
diff --git 
a/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java 
b/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
index 9d67c3e..7663d51 100644
--- 
a/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
+++ 
b/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
@@ -177,6 +177,20 @@ public class SearchCondVisitor extends 
AbstractSearchConditionVisitorhttp://git-wip-us.apache.org/repos/asf/syncope/blob/80d7e53c/core/src/test/java/org/apache/syncope/core/rest/UserSelfTestITCase.java
--
diff --git 
a/core/src/test/java/org/apache/syncope/core/rest/UserSelfTestITCase.java 
b/core/src/test/java/org/apache/syncope/core/rest/UserSelfTestITCase.java
index 9b6ff13..c0c3d75 100644
--- a/core/src/test/java/org/apache/syncope/core/rest/UserSelfTestITCase.java
+++ b/core/src/test/java/org/apache/syncope/core/rest/UserSelfTestITCase.java
@@ -39,6 +39,7 @@ import org.apache.syncope.common.mod.AttributeMod;
 import org.apache.syncope.common.mod.MembershipMod;
 import org.apache.syncope.common.mod.StatusMod;
 import org.apache.syncope.common.mod.UserMod;
+import org.apache.syncope.common.reqres.PagedResult;
 import org.apache.syncope.common.services.UserSelfService;
 import org.apache.syncope.common.services.UserService;
 import org.apache.syncope.common.to.MembershipTO;
@@ -272,6 +273,9 @@ public class UserSelfTestITCase extends AbstractTest {
 UserTO read = authClient.getService(UserSelfService.class).read();
 assertNotNull(read);
 
+// SYNCOPE-1293:get users with token not null before requesting 
password reset
+PagedResult before = userService.search("token!=$null");
+
 // 3. request password reset (as anonymous) providing the expected 
security answer
 SyncopeClient anonClient = clientFactory.createAnonymous();
 try {
@@ -282,6 +286,10 @@ public class UserSelfTestITCase extends AbstractTest {
 }
 
anonClient.getService(UserSelfService.class).requestPasswordReset(user.getUsername(),
 "Rossi");
 
+// SYNCOPE-1293:get users with token not null before requesting 
password reset
+PagedResult after = userService.search("token!=$null");
+assertEquals(before.getTotalCount() + 1, after.getTotalCount());
+
 // 4. get token (normally sent via e-mail, now reading as admin)
 String token = userService.read(read.getId()).getToken();
 assertNotNull(token);

[2/2] syncope git commit: [SYNCOPE-1293] Explicitly allow token Vs comparison

2018-04-05 Thread ilgrosso 
[SYNCOPE-1293] Explicitly allow token Vs  comparison


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

Branch: refs/heads/master
Commit: a8ae113d902e33ba27e03dd5d250187868f45c41
Parents: 95ee2ff
Author: Francesco Chicchiriccò 
Authored: Thu Apr 5 10:17:07 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Apr 5 10:17:26 2018 +0200

--
 .../panels/search/AbstractSearchPanel.java|  2 +-
 .../common/lib/search/SearchableFields.java   | 11 +++
 .../persistence/api/search/SearchCondVisitor.java | 18 +-
 .../apache/syncope/fit/core/UserSelfITCase.java   |  9 +
 4 files changed, 30 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/a8ae113d/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
index 3d44dec..9103ba6 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
@@ -175,7 +175,7 @@ public abstract class AbstractSearchPanel extends Panel {
 
 @Override
 protected List load() {
-return SearchableFields.get(typeKind);
+return SearchableFields.get(typeKind.getTOClass());
 }
 };
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/a8ae113d/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
--
diff --git 
a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
 
b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
index 77a7d13..c5102a4 100644
--- 
a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
+++ 
b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
@@ -31,7 +31,6 @@ import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.to.UserTO;
-import org.apache.syncope.common.lib.types.AnyTypeKind;
 
 public final class SearchableFields {
 
@@ -42,19 +41,15 @@ public final class SearchableFields {
 private static final Set ANY_FIELDS = new HashSet<>();
 
 static {
-ANY_FIELDS.addAll(SearchableFields.get(UserTO.class));
-ANY_FIELDS.addAll(SearchableFields.get(GroupTO.class));
-ANY_FIELDS.addAll(SearchableFields.get(AnyObjectTO.class));
+ANY_FIELDS.addAll(get(UserTO.class));
+ANY_FIELDS.addAll(get(GroupTO.class));
+ANY_FIELDS.addAll(get(AnyObjectTO.class));
 }
 
 public static boolean contains(final String schema) {
 return ANY_FIELDS.contains(schema);
 }
 
-public static List get(final AnyTypeKind anyTypeKind) {
-return get(anyTypeKind.getTOClass());
-}
-
 public static List get(final Class anyRef) {
 final List fieldNames = new ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/a8ae113d/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
--
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
index 103d3d6..468321d 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
@@ -194,7 +194,9 @@ public class SearchCondVisitor extends 
AbstractSearchConditionVisitorhttp://git-wip-us.apache.org/repos/asf/syncope/blob/a8ae113d/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
--
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java

[1/2] syncope git commit: [SYNCOPE-1293] Explicitly allow token Vs comparison

2018-04-05 Thread ilgrosso 
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 38327a0a2 -> 79354db35
  refs/heads/master 95ee2ffe8 -> a8ae113d9


[SYNCOPE-1293] Explicitly allow token Vs  comparison


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

Branch: refs/heads/2_0_X
Commit: 79354db353792907c175dffe94205b17569313cc
Parents: 38327a0
Author: Francesco Chicchiriccò 
Authored: Thu Apr 5 10:17:07 2018 +0200
Committer: Francesco Chicchiriccò 
Committed: Thu Apr 5 10:17:07 2018 +0200

--
 .../panels/search/AbstractSearchPanel.java|  2 +-
 .../common/lib/search/SearchableFields.java   | 11 +++
 .../persistence/api/search/SearchCondVisitor.java | 18 +-
 .../apache/syncope/fit/core/UserSelfITCase.java   |  9 +
 4 files changed, 30 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/syncope/blob/79354db3/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
--
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
index 5c02669..be1d2b1 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/AbstractSearchPanel.java
@@ -175,7 +175,7 @@ public abstract class AbstractSearchPanel extends Panel {
 
 @Override
 protected List load() {
-return SearchableFields.get(typeKind);
+return SearchableFields.get(typeKind.getTOClass());
 }
 };
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/79354db3/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
--
diff --git 
a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
 
b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
index 77a7d13..c5102a4 100644
--- 
a/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
+++ 
b/common/lib/src/main/java/org/apache/syncope/common/lib/search/SearchableFields.java
@@ -31,7 +31,6 @@ import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.to.UserTO;
-import org.apache.syncope.common.lib.types.AnyTypeKind;
 
 public final class SearchableFields {
 
@@ -42,19 +41,15 @@ public final class SearchableFields {
 private static final Set ANY_FIELDS = new HashSet<>();
 
 static {
-ANY_FIELDS.addAll(SearchableFields.get(UserTO.class));
-ANY_FIELDS.addAll(SearchableFields.get(GroupTO.class));
-ANY_FIELDS.addAll(SearchableFields.get(AnyObjectTO.class));
+ANY_FIELDS.addAll(get(UserTO.class));
+ANY_FIELDS.addAll(get(GroupTO.class));
+ANY_FIELDS.addAll(get(AnyObjectTO.class));
 }
 
 public static boolean contains(final String schema) {
 return ANY_FIELDS.contains(schema);
 }
 
-public static List get(final AnyTypeKind anyTypeKind) {
-return get(anyTypeKind.getTOClass());
-}
-
 public static List get(final Class anyRef) {
 final List fieldNames = new ArrayList<>();
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/79354db3/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
--
diff --git 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
index e9e5951..29ee195 100644
--- 
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
+++ 
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/search/SearchCondVisitor.java
@@ -185,7 +185,9 @@ public class SearchCondVisitor extends 
AbstractSearchConditionVisitorhttp://git-wip-us.apache.org/repos/asf/syncope/blob/79354db3/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserSelfITCase.java
--
diff --git