This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new cf294a2  [SYNCOPE-1421] Domain management - missing updates
cf294a2 is described below

commit cf294a26b3ed348d10055de8edca322ccdbf4770
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Tue May 7 13:50:56 2019 +0200

    [SYNCOPE-1421] Domain management - missing updates
---
 .../client/enduser/SyncopeEnduserSession.java        |  4 ----
 .../syncope/client/enduser/rest/BaseRestClient.java  | 20 ++++++++++++++++++++
 .../console/panels/CamelRoutesDirectoryPanel.java    |  2 +-
 .../console/panels/BpmnProcessDirectoryPanel.java    |  2 +-
 .../client/console/panels/NewBpmnProcess.java        |  2 +-
 .../console/panels/UserRequestDirectoryPanel.java    |  2 +-
 .../panels/UserRequestFormDirectoryPanel.java        |  2 +-
 .../client/console/panels/UserRequestFormModal.java  |  2 +-
 .../resources/AbstractBpmnProcessResource.java       |  2 +-
 .../client/enduser/rest/UserRequestRestClient.java   | 12 +++++-------
 .../client/console/pages/OIDCClientLogin.java        |  5 ++---
 .../console/panels/OIDCProvidersDirectoryPanel.java  |  2 +-
 .../client/console/panels/OIDCSSOLoginFormPanel.java |  2 +-
 .../console/wizards/OIDCProviderWizardBuilder.java   |  2 +-
 .../syncope/client/console/pages/SAML2SPLogin.java   |  5 ++---
 .../client/console/panels/ImportMetadata.java        |  2 +-
 .../console/panels/SAML2IdPsDirectoryPanel.java      |  2 +-
 .../syncope/client/console/panels/SAML2SPPanel.java  |  2 +-
 .../client/console/panels/SAMLSSOLoginFormPanel.java |  2 +-
 .../syncope/client/console/pages/SCIMConfPage.java   |  2 +-
 .../syncope/fit/console/AbstractTypesITCase.java     |  2 +-
 .../apache/syncope/fit/console/AnyObjectsITCase.java |  2 +-
 .../syncope/fit/console/AnyTypeClassesITCase.java    |  2 +-
 .../apache/syncope/fit/console/AnyTypesITCase.java   |  2 +-
 .../apache/syncope/fit/console/BatchesITCase.java    |  2 +-
 .../org/apache/syncope/fit/console/GroupsITCase.java |  2 +-
 .../org/apache/syncope/fit/console/LogsITCase.java   |  2 +-
 .../syncope/fit/console/NotificationsITCase.java     |  2 +-
 .../apache/syncope/fit/console/ParametersITCase.java |  2 +-
 .../apache/syncope/fit/console/PoliciesITCase.java   |  2 +-
 .../org/apache/syncope/fit/console/RealmsITCase.java |  2 +-
 .../syncope/fit/console/RelationshipTypesITCase.java |  2 +-
 .../apache/syncope/fit/console/ReportsITCase.java    |  2 +-
 .../org/apache/syncope/fit/console/RolesITCase.java  |  2 +-
 .../apache/syncope/fit/console/SchemasITCase.java    |  2 +-
 .../syncope/fit/console/SecurityQuestionsITCase.java |  2 +-
 .../apache/syncope/fit/console/TopologyITCase.java   |  2 +-
 .../org/apache/syncope/fit/console/UsersITCase.java  |  2 +-
 38 files changed, 62 insertions(+), 50 deletions(-)

diff --git 
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
 
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
index e0314c9..245857b 100644
--- 
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
+++ 
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserSession.java
@@ -96,10 +96,6 @@ public class SyncopeEnduserSession extends WebSession 
implements BaseSession {
         services.clear();
     }
 
-    public MediaType getMediaType() {
-        return clientFactory.getContentType().getMediaType();
-    }
-
     public String getJWT() {
         return client == null ? null : client.getJWT();
     }
diff --git 
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/rest/BaseRestClient.java
 
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/rest/BaseRestClient.java
index 3015df7..6f9e4ff 100644
--- 
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/rest/BaseRestClient.java
+++ 
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/rest/BaseRestClient.java
@@ -19,8 +19,11 @@
 package org.apache.syncope.client.enduser.rest;
 
 import org.apache.syncope.client.enduser.SyncopeEnduserSession;
+import org.apache.syncope.client.lib.SyncopeClient;
 import org.apache.syncope.client.ui.commons.rest.RestClient;
+import org.apache.syncope.common.lib.search.OrderByClauseBuilder;
 import org.apache.syncope.common.rest.api.service.SyncopeService;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,4 +48,21 @@ public abstract class BaseRestClient implements RestClient {
     protected static <T> void resetClient(final Class<T> serviceClass) {
         SyncopeEnduserSession.get().resetClient(serviceClass);
     }
+
+    protected static String toOrderBy(final SortParam<String> sort) {
+        OrderByClauseBuilder builder = SyncopeClient.getOrderByClauseBuilder();
+
+        String property = sort.getProperty();
+        if (property.indexOf('#') != -1) {
+            property = property.substring(property.indexOf('#') + 1);
+        }
+
+        if (sort.isAscending()) {
+            builder.asc(property);
+        } else {
+            builder.desc(property);
+        }
+
+        return builder.build();
+    }
 }
diff --git 
a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
 
b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
index 00307c8..51f325c 100644
--- 
a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
+++ 
b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java
@@ -24,7 +24,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.syncope.client.console.commons.Constants;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
 import 
org.apache.syncope.client.console.commons.SortableDataProviderComparator;
 import org.apache.syncope.client.console.pages.BasePage;
@@ -35,6 +34,7 @@ import 
org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel;
 import 
org.apache.syncope.client.console.wicket.markup.html.form.XMLEditorPanel;
 import org.apache.syncope.client.console.wizards.WizardMgtPanel;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.common.lib.to.CamelRouteTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.CamelEntitlement;
diff --git 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/BpmnProcessDirectoryPanel.java
 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/BpmnProcessDirectoryPanel.java
index 06ca958..43d2d9a 100644
--- 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/BpmnProcessDirectoryPanel.java
+++ 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/BpmnProcessDirectoryPanel.java
@@ -33,7 +33,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.SyncopeWebApplication;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
 import 
org.apache.syncope.client.console.commons.SortableDataProviderComparator;
 import org.apache.syncope.client.console.pages.BasePage;
diff --git 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/NewBpmnProcess.java
 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/NewBpmnProcess.java
index e28fb62..5435006 100644
--- 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/NewBpmnProcess.java
+++ 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/NewBpmnProcess.java
@@ -24,7 +24,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pdfbox.util.Charsets;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.BasePage;
 import org.apache.syncope.client.console.rest.BpmnProcessRestClient;
 import org.apache.wicket.PageReference;
diff --git 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestDirectoryPanel.java
 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestDirectoryPanel.java
index 3c043ac..827e477 100644
--- 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestDirectoryPanel.java
+++ 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestDirectoryPanel.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
 import org.apache.syncope.client.console.pages.BasePage;
 import 
org.apache.syncope.client.console.panels.UserRequestDirectoryPanel.UserRequestProvider;
diff --git 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
index a36f3ef..6202c0b 100644
--- 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
+++ 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
 import org.apache.syncope.client.console.rest.UserRequestRestClient;
 import 
org.apache.syncope.client.console.panels.UserRequestFormDirectoryPanel.UserRequestFormProvider;
diff --git 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormModal.java
 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormModal.java
index 7bc6fdd..eb469e6 100644
--- 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormModal.java
+++ 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormModal.java
@@ -19,7 +19,7 @@
 package org.apache.syncope.client.console.panels;
 
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.BasePage;
 import org.apache.syncope.client.console.rest.UserRequestRestClient;
 import 
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
diff --git 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/resources/AbstractBpmnProcessResource.java
 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/resources/AbstractBpmnProcessResource.java
index 7ad5f24..c5b7a25 100644
--- 
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/resources/AbstractBpmnProcessResource.java
+++ 
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/resources/AbstractBpmnProcessResource.java
@@ -19,7 +19,7 @@
 package org.apache.syncope.client.console.resources;
 
 import javax.ws.rs.NotFoundException;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.rest.BpmnProcessRestClient;
 import org.apache.syncope.common.lib.to.BpmnProcess;
 import org.apache.wicket.request.resource.AbstractResource;
diff --git 
a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/rest/UserRequestRestClient.java
 
b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/rest/UserRequestRestClient.java
index 9a844ff..6179ade 100644
--- 
a/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/rest/UserRequestRestClient.java
+++ 
b/ext/flowable/client-enduser/src/main/java/org/apache/syncope/client/enduser/rest/UserRequestRestClient.java
@@ -45,12 +45,11 @@ public class UserRequestRestClient extends BaseRestClient {
             final int size,
             final String username,
             final SortParam<String> sort) {
-        return getService(UserRequestService.class).list(
-                new UserRequestQuery.Builder()
-                        .user(StringUtils.isBlank(username)
-                                ? 
SyncopeEnduserSession.get().getSelfTO().getUsername()
-                                : username)
-                        .page(page).size(size).build()).getResult();
+        return getService(UserRequestService.class).list(new 
UserRequestQuery.Builder().
+                user(StringUtils.isBlank(username)
+                        ? SyncopeEnduserSession.get().getSelfTO().getUsername()
+                        : username).
+                page(page).size(size).build()).getResult();
     }
 
     public void cancelRequest(final String executionId, final String reason) {
@@ -85,5 +84,4 @@ public class UserRequestRestClient extends BaseRestClient {
     public void start(final String bpmnProcess, final String user) {
         getService(UserRequestService.class).start(bpmnProcess, user);
     }
-
 }
diff --git 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClientLogin.java
 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClientLogin.java
index af979d7..d91019c 100644
--- 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClientLogin.java
+++ 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/pages/OIDCClientLogin.java
@@ -20,6 +20,7 @@ package org.apache.syncope.client.console.pages;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.ui.commons.Constants;
 
 import org.apache.wicket.authentication.IAuthenticationStrategy;
 import org.apache.wicket.markup.html.WebPage;
@@ -53,9 +54,7 @@ public class OIDCClientLogin extends WebPage {
 
         if (SyncopeConsoleSession.get().authenticate(token)) {
             if (parameters.get("logoutSupported").toBoolean(false)) {
-                SyncopeConsoleSession.get().setAttribute(
-                        
org.apache.syncope.client.console.commons.Constants.BEFORE_LOGOUT_PAGE,
-                        OIDCClientBeforeLogout.class);
+                
SyncopeConsoleSession.get().setAttribute(Constants.BEFORE_LOGOUT_PAGE, 
OIDCClientBeforeLogout.class);
             }
 
             // If login has been called because the user was not yet logged 
in, than continue to the
diff --git 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCProvidersDirectoryPanel.java
 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCProvidersDirectoryPanel.java
index 4118e95..b687eb5 100644
--- 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCProvidersDirectoryPanel.java
+++ 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCProvidersDirectoryPanel.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
 import 
org.apache.syncope.client.console.commons.SortableDataProviderComparator;
 import org.apache.syncope.client.console.layout.UserFormLayoutInfo;
diff --git 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCSSOLoginFormPanel.java
 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCSSOLoginFormPanel.java
index e83833c..3edbae9 100644
--- 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCSSOLoginFormPanel.java
+++ 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/panels/OIDCSSOLoginFormPanel.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.commons.collections4.IterableUtils;
 import org.apache.commons.collections4.Predicate;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import 
org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoicePanel;
 import org.apache.syncope.common.lib.to.OIDCProviderTO;
 import org.apache.syncope.common.rest.api.service.OIDCProviderService;
diff --git 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderWizardBuilder.java
 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderWizardBuilder.java
index 0278d89..633ed1d 100644
--- 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderWizardBuilder.java
+++ 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderWizardBuilder.java
@@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.SyncopeWebApplication;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.panels.OIDCProvidersDirectoryPanel;
 import org.apache.syncope.client.console.rest.ImplementationRestClient;
 import org.apache.syncope.client.console.rest.OIDCProviderRestClient;
diff --git 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPLogin.java
 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPLogin.java
index d6b10c9..194986f 100644
--- 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPLogin.java
+++ 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/pages/SAML2SPLogin.java
@@ -20,6 +20,7 @@ package org.apache.syncope.client.console.pages;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.wicket.authentication.IAuthenticationStrategy;
 import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -52,9 +53,7 @@ public class SAML2SPLogin extends WebPage {
 
         if (SyncopeConsoleSession.get().authenticate(token)) {
             if (parameters.get("sloSupported").toBoolean(false)) {
-                SyncopeConsoleSession.get().setAttribute(
-                        
org.apache.syncope.client.console.commons.Constants.BEFORE_LOGOUT_PAGE,
-                        SAML2SPBeforeLogout.class);
+                
SyncopeConsoleSession.get().setAttribute(Constants.BEFORE_LOGOUT_PAGE, 
SAML2SPBeforeLogout.class);
             }
 
             // If login has been called because the user was not yet logged 
in, than continue to the
diff --git 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
index cbc8234..6c64658 100644
--- 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
+++ 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.BasePage;
 import org.apache.syncope.client.console.rest.SAML2IdPsRestClient;
 import org.apache.wicket.PageReference;
diff --git 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java
 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java
index 364c9f3..8cdd6bd 100644
--- 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java
+++ 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java
@@ -29,7 +29,7 @@ import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.wizards.SAML2IdPWizardBuilder;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.commons.DirectoryDataProvider;
 import 
org.apache.syncope.client.console.commons.SortableDataProviderComparator;
 import org.apache.syncope.client.console.layout.UserFormLayoutInfo;
diff --git 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2SPPanel.java
 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2SPPanel.java
index f1318d5..25eb122 100644
--- 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2SPPanel.java
+++ 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2SPPanel.java
@@ -20,7 +20,7 @@ package org.apache.syncope.client.console.panels;
 
 import javax.ws.rs.client.ClientBuilder;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.ui.commons.HttpResourceStream;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.Panel;
diff --git 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAMLSSOLoginFormPanel.java
 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAMLSSOLoginFormPanel.java
index f315586..d3d01a6 100644
--- 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAMLSSOLoginFormPanel.java
+++ 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAMLSSOLoginFormPanel.java
@@ -22,7 +22,7 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import 
org.apache.syncope.client.ui.commons.markup.html.form.AjaxDropDownChoicePanel;
 import org.apache.syncope.common.lib.to.SAML2IdPTO;
 import org.apache.syncope.common.rest.api.service.SAML2IdPService;
diff --git 
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/pages/SCIMConfPage.java
 
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/pages/SCIMConfPage.java
index 230b66b..dc3c098 100644
--- 
a/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/pages/SCIMConfPage.java
+++ 
b/ext/scimv2/client-console/src/main/java/org/apache/syncope/client/console/pages/SCIMConfPage.java
@@ -24,11 +24,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.ui.commons.annotations.ExtPage;
-import org.apache.syncope.client.console.commons.Constants;
 import org.apache.syncope.client.console.panels.SCIMConfPanel;
 import org.apache.syncope.client.console.rest.SCIMConfRestClient;
 import 
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
 import org.apache.syncope.client.console.wizards.any.ResultPage;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.common.lib.scim.SCIMConf;
 import org.apache.syncope.common.lib.scim.types.SCIMEntitlement;
 import org.apache.wicket.markup.html.WebMarkupContainer;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
index d3f74c7..dbd53a1 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AbstractTypesITCase.java
@@ -19,7 +19,7 @@
 package org.apache.syncope.fit.console;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Types;
 import 
org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.AjaxFallbackDataTable;
 import org.apache.wicket.util.tester.FormTester;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyObjectsITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyObjectsITCase.java
index a40cb6d..6c3cf2c 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyObjectsITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyObjectsITCase.java
@@ -24,7 +24,7 @@ import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.util.tester.FormTester;
 import org.junit.jupiter.api.Test;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import 
org.apache.syncope.client.console.wicket.markup.html.form.IndicatingOnConfirmAjaxLink;
 import org.apache.wicket.markup.html.form.TextField;
 import org.junit.jupiter.api.BeforeEach;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java
index a6fea22..272b2e5 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypeClassesITCase.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Types;
 import org.apache.syncope.client.console.panels.AjaxDataTablePanel;
 import 
org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.AjaxFallbackDataTable;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java
index 94f4695..ba213ab 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/AnyTypesITCase.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Realms;
 import org.apache.syncope.client.console.pages.Types;
 import org.apache.syncope.client.console.panels.AjaxDataTablePanel;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BatchesITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BatchesITCase.java
index d56904f..f1eb67f 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BatchesITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BatchesITCase.java
@@ -21,7 +21,7 @@ package org.apache.syncope.fit.console;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.ui.commons.status.Status;
 import org.apache.syncope.client.ui.commons.status.StatusBean;
 import org.apache.wicket.Component;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/GroupsITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/GroupsITCase.java
index daac35d..df88ad5 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/GroupsITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/GroupsITCase.java
@@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.util.tester.FormTester;
 import org.junit.jupiter.api.Test;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import 
org.apache.syncope.client.console.wicket.markup.html.form.IndicatingOnConfirmAjaxLink;
 import org.junit.jupiter.api.BeforeEach;
 
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java
index e318a57..b164e28 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java
@@ -21,7 +21,7 @@ package org.apache.syncope.fit.console;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.lang.reflect.InvocationTargetException;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Logs;
 import org.apache.syncope.common.lib.log.LoggerTO;
 import org.apache.wicket.Component;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java
index 9b9c3e0..a402bf8 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Notifications;
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.WebMarkupContainer;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java
index e8d985b..ef7f3aa 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ParametersITCase.java
@@ -21,7 +21,7 @@ package org.apache.syncope.fit.console;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Parameters;
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.WebMarkupContainer;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/PoliciesITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/PoliciesITCase.java
index ca6f63d..0ebf086 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/PoliciesITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/PoliciesITCase.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Policies;
 import org.apache.syncope.client.console.pages.Realms;
 import org.apache.wicket.Component;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java
index 44518de..371e24d 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java
@@ -21,7 +21,7 @@ package org.apache.syncope.fit.console;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Realms;
 import org.apache.syncope.client.console.panels.TogglePanel;
 import org.apache.wicket.Component;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RelationshipTypesITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RelationshipTypesITCase.java
index a740dfa..4e27563 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RelationshipTypesITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RelationshipTypesITCase.java
@@ -21,7 +21,7 @@ package org.apache.syncope.fit.console;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.panels.AjaxDataTablePanel;
 import 
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
 import org.apache.wicket.Component;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java
index 6d75a0c..d5d199a 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/ReportsITCase.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Reports;
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.form.TextField;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
index 25eb447..054c78f 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RolesITCase.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Security;
 import org.apache.wicket.Component;
 import org.apache.wicket.util.tester.FormTester;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
index 42ec236..d5e4268 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SchemasITCase.java
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Types;
 import org.apache.syncope.client.console.panels.AjaxDataTablePanel;
 import org.apache.wicket.Component;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java
index aa9658b..a63448d 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/SecurityQuestionsITCase.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.pages.Security;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
index 5a4c5d1..2a4cce3 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
 import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
 import java.util.UUID;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.console.panels.TogglePanel;
 import org.apache.syncope.client.console.topology.Topology;
 import org.apache.syncope.client.ui.commons.markup.html.form.NonI18nPalette;
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
index 691ec4e..3187cfc 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
@@ -28,7 +28,7 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.util.tester.FormTester;
 import org.junit.jupiter.api.Test;
-import org.apache.syncope.client.console.commons.Constants;
+import org.apache.syncope.client.ui.commons.Constants;
 import 
org.apache.syncope.client.console.wicket.markup.html.form.IndicatingOnConfirmAjaxLink;
 import org.junit.jupiter.api.BeforeEach;
 

Reply via email to