[syncope] branch 2_0_X updated: [SYNCOPE-1432] Topology now shows new created connectors and resources with no need of refreshing page

[skylark17]

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

skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_0_X by this push:
     new 3b333a2  [SYNCOPE-1432] Topology now shows new created connectors and 
resources with no need of refreshing page
3b333a2 is described below

commit 3b333a29ee2036c934d5b5529cde17469bd4a0cc
Author: skylark17 <matteo.alessandr...@tirasa.net>
AuthorDate: Mon Mar 4 11:43:22 2019 +0100

    [SYNCOPE-1432] Topology now shows new created connectors and resources with 
no need of refreshing page
---
 .../org/apache/syncope/client/console/SyncopeConsoleApplication.java  | 4 ++--
 .../org/apache/syncope/client/console/wizards/any/AbstractAttrs.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index 8a544fb..27efd58 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -60,8 +60,8 @@ import 
org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
 import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
 import 
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
 import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.CsrfPreventionRequestCycleListener;
 import org.apache.wicket.protocol.http.WebApplication;
+import 
org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleListener;
 import org.apache.wicket.protocol.ws.api.WebSocketResponse;
 import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
 import org.apache.wicket.request.cycle.RequestCycle;
@@ -214,7 +214,7 @@ public class SyncopeConsoleApplication extends 
AuthenticatedWebApplication {
         getMarkupSettings().setCompressWhitespace(true);
 
         if (BooleanUtils.toBoolean(csrf)) {
-            getRequestCycleListeners().add(new 
CsrfPreventionRequestCycleListener());
+            getRequestCycleListeners().add(new 
WebSocketAwareCsrfPreventionRequestCycleListener());
         }
         getRequestCycleListeners().add(new 
SyncopeConsoleRequestCycleListener());
         getRequestCycleListeners().add(new AbstractRequestCycleListener() {
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 1916b17..537341c 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
@@ -176,8 +176,8 @@ public abstract class AbstractAttrs<S extends SchemaTO> 
extends WizardStep imple
     @Override
     public void renderHead(final IHeaderResponse response) {
         super.renderHead(response);
-        if 
(org.apache.cxf.common.util.CollectionUtils.isEmpty(attrTOs.getObject())
-                && 
org.apache.cxf.common.util.CollectionUtils.isEmpty(membershipTOs.getObject())) {
+        if (CollectionUtils.isEmpty(attrTOs.getObject())
+                && CollectionUtils.isEmpty(membershipTOs.getObject())) {
             response.render(OnDomReadyHeaderItem.forScript(
                     String.format("$('#emptyPlaceholder').append(\"%s\"); 
$('#attributes').hide();",
                             getString("attribute.empty.list"))));