You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/06/12 14:49:48 UTC
[1/2] syncope git commit: Minor fixes;
including TogglePanel icon vertical align and modern veil
Repository: syncope
Updated Branches:
refs/heads/2_0_X 7516e43c9 -> 14fe5c454
refs/heads/master a90d50ec5 -> 3a7cf682f
Minor fixes; including TogglePanel icon vertical align and modern veil
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/14fe5c45
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/14fe5c45
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/14fe5c45
Branch: refs/heads/2_0_X
Commit: 14fe5c45471ec7001c4e5a32cb3156cd1f182898
Parents: 7516e43
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 12 16:49:27 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 12 16:49:27 2017 +0200
----------------------------------------------------------------------
.../client/console/commons/Constants.java | 2 ++
.../syncope/client/console/pages/BasePage.java | 2 +-
.../console/panels/UserDirectoryPanel.java | 2 +-
.../console/topology/TopologyNodePanel.java | 3 ++-
.../wicket/markup/html/form/ActionPanel.java | 5 ++--
.../wicket/markup/html/form/ActionsPanel.java | 2 +-
.../markup/html/link/VeilPopupSettings.java | 3 ++-
.../META-INF/resources/css/syncopeConsole.css | 4 +++
.../core/logic/LogicInvocationHandler.java | 26 ++++++++++----------
.../api/dao/search/OrderByClause.java | 5 +++-
.../api/event/AfterHandlingEvent.java | 16 ------------
.../provisioning/java/AuditManagerImpl.java | 20 +++++++--------
.../notification/NotificationManagerImpl.java | 20 +++++++--------
.../pushpull/AbstractPushResultHandler.java | 2 --
.../pushpull/RealmPushResultHandlerImpl.java | 2 --
15 files changed, 51 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index e49f10d..588790d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -29,6 +29,8 @@ public final class Constants {
public static final String SYNCOPE = "syncope";
+ public static final String VEIL_INDICATOR_MARKUP_ID = "veil";
+
public static final String ACTIVITI_MODELER_CONTEXT = "activiti-modeler";
public static final String FLOWABLE_MODELER_CONTEXT = "flowable-modeler";
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index b9b9926..371e425 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -401,7 +401,7 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
@Override
public String getAjaxIndicatorMarkupId() {
- return "veil";
+ return Constants.VEIL_INDICATOR_MARKUP_ID;
}
public NotificationPanel getNotificationPanel() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index 5a62063..dae614f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -128,7 +128,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient
@Override
protected List<IColumn<UserTO, String>> getColumns() {
final List<IColumn<UserTO, String>> columns = new ArrayList<>();
- final List<IColumn<UserTO, String>> prefcolumns = new ArrayList<IColumn<UserTO, String>>();
+ final List<IColumn<UserTO, String>> prefcolumns = new ArrayList<>();
columns.add(new KeyPropertyColumn<UserTO>(
new ResourceModel(Constants.KEY_FIELD_NAME, Constants.KEY_FIELD_NAME), Constants.KEY_FIELD_NAME));
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
index b563cca..2d81c3d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
@@ -19,6 +19,7 @@
package org.apache.syncope.client.console.topology;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.rest.ConnectorRestClient;
import org.apache.syncope.client.console.topology.TopologyNode.Kind;
import org.apache.syncope.client.console.topology.TopologyTogglePanel.UpdateEvent;
@@ -108,7 +109,7 @@ public class TopologyNodePanel extends Panel implements IAjaxIndicatorAware {
@Override
public String getAjaxIndicatorMarkupId() {
- return "veil";
+ return Constants.VEIL_INDICATOR_MARKUP_ID;
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
index 6f147c0..8eb3135 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.wicket.markup.html.form;
import java.io.Serializable;
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.console.wicket.markup.html.form.ActionLink.ActionType;
import org.apache.syncope.client.console.wicket.markup.html.link.VeilPopupSettings;
import org.apache.wicket.AttributeModifier;
@@ -108,7 +109,7 @@ public final class ActionPanel<T extends Serializable> extends Panel {
@Override
public String getAjaxIndicatorMarkupId() {
return disableIndicator || !action.getLink().isIndicatorEnabled()
- ? StringUtils.EMPTY : super.getAjaxIndicatorMarkupId();
+ ? StringUtils.EMPTY : Constants.VEIL_INDICATOR_MARKUP_ID;
}
}
: new IndicatingAjaxLink<Void>("action") {
@@ -124,7 +125,7 @@ public final class ActionPanel<T extends Serializable> extends Panel {
@Override
public String getAjaxIndicatorMarkupId() {
return disableIndicator || !action.getLink().isIndicatorEnabled()
- ? StringUtils.EMPTY : super.getAjaxIndicatorMarkupId();
+ ? StringUtils.EMPTY : Constants.VEIL_INDICATOR_MARKUP_ID;
}
};
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java
index 6c26aa9..71d342c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java
@@ -50,7 +50,7 @@ public final class ActionsPanel<T extends Serializable> extends Panel {
@Override
protected void populateItem(final ListItem<Action<T>> item) {
- item.add(new ActionPanel<T>(ActionsPanel.this.model, item.getModelObject()));
+ item.add(new ActionPanel<>(ActionsPanel.this.model, item.getModelObject()));
}
}.setRenderBodyOnly(true));
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
index 6a766be..c85cfda 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.wicket.markup.html.link;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.wicket.markup.html.link.PopupSettings;
public class VeilPopupSettings extends PopupSettings {
@@ -26,7 +27,7 @@ public class VeilPopupSettings extends PopupSettings {
@Override
public String getPopupJavaScript() {
- return "document.getElementById('veil').style.display = 'block';"
+ return "document.getElementById('" + Constants.VEIL_INDICATOR_MARKUP_ID + "').style.display = 'block';"
+ super.getPopupJavaScript().substring(0, super.getPopupJavaScript().lastIndexOf("return false;"))
+ "var loop = setInterval(function() { "
+ " if(w.closed) {"
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
index a9f3848..da65a20 100644
--- a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
+++ b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
@@ -1137,6 +1137,10 @@ ul.menu li a {
cursor: pointer !important;
}
+ul.menu i {
+ width: 35px;
+}
+
.toggle-menu ul.menu li a {
padding: 0px;
text-align: left;
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java b/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java
index a70f3c0..38c5e92 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java
@@ -97,19 +97,19 @@ public class LogicInvocationHandler {
LOG.debug("After throwing {}.{}", clazz.getSimpleName(), event);
throw t;
} finally {
- Map<String, Object> jobMap = new HashMap<>();
- jobMap.put(AfterHandlingEvent.JOBMAP_KEY, new AfterHandlingEvent(
- notificationsAvailable,
- auditRequested,
- AuditElements.EventCategoryType.LOGIC,
- category,
- null,
- event,
- condition,
- before,
- output,
- input));
- AfterHandlingJob.schedule(scheduler, jobMap);
+ if (notificationsAvailable || auditRequested) {
+ Map<String, Object> jobMap = new HashMap<>();
+ jobMap.put(AfterHandlingEvent.JOBMAP_KEY, new AfterHandlingEvent(
+ AuditElements.EventCategoryType.LOGIC,
+ category,
+ null,
+ event,
+ condition,
+ before,
+ output,
+ input));
+ AfterHandlingJob.schedule(scheduler, jobMap);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
index 46a9d80..8d4b978 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
@@ -18,12 +18,15 @@
*/
package org.apache.syncope.core.persistence.api.dao.search;
+import java.io.Serializable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-public class OrderByClause {
+public class OrderByClause implements Serializable {
+
+ private static final long serialVersionUID = -1741826744085524716L;
public enum Direction {
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java
index b207cb9..2e2e44e 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java
@@ -27,10 +27,6 @@ public class AfterHandlingEvent implements Serializable {
public static final String JOBMAP_KEY = "AfterHandlingEvent";
- private final boolean notificationsAvailable;
-
- private final boolean auditRequested;
-
private final AuditElements.EventCategoryType type;
private final String category;
@@ -48,8 +44,6 @@ public class AfterHandlingEvent implements Serializable {
private final Object[] input;
public AfterHandlingEvent(
- final boolean notificationsAvailable,
- final boolean auditRequested,
final AuditElements.EventCategoryType type,
final String category,
final String subcategory,
@@ -59,8 +53,6 @@ public class AfterHandlingEvent implements Serializable {
final Object output,
final Object... input) {
- this.notificationsAvailable = notificationsAvailable;
- this.auditRequested = auditRequested;
this.type = type;
this.category = category;
this.subcategory = subcategory;
@@ -71,14 +63,6 @@ public class AfterHandlingEvent implements Serializable {
this.input = input;
}
- public boolean isNotificationsAvailable() {
- return notificationsAvailable;
- }
-
- public boolean isAuditRequested() {
- return auditRequested;
- }
-
public AuditElements.EventCategoryType getType() {
return type;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java
index 359538b..14180ec 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java
@@ -80,17 +80,15 @@ public class AuditManagerImpl implements AuditManager {
@Override
public void audit(final AfterHandlingEvent event) {
- if (event.isAuditRequested()) {
- audit(
- event.getType(),
- event.getCategory(),
- event.getSubcategory(),
- event.getEvent(),
- event.getCondition(),
- event.getBefore(),
- event.getOutput(),
- event.getInput());
- }
+ audit(
+ event.getType(),
+ event.getCategory(),
+ event.getSubcategory(),
+ event.getEvent(),
+ event.getCondition(),
+ event.getBefore(),
+ event.getOutput(),
+ event.getInput());
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
index c438da3..1e6f531 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
@@ -279,17 +279,15 @@ public class NotificationManagerImpl implements NotificationManager {
@Override
public void createTasks(final AfterHandlingEvent event) {
- if (event.isNotificationsAvailable()) {
- createTasks(
- event.getType(),
- event.getCategory(),
- event.getSubcategory(),
- event.getEvent(),
- event.getCondition(),
- event.getBefore(),
- event.getOutput(),
- event.getInput());
- }
+ createTasks(
+ event.getType(),
+ event.getCategory(),
+ event.getSubcategory(),
+ event.getEvent(),
+ event.getCondition(),
+ event.getBefore(),
+ event.getOutput(),
+ event.getInput());
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
index bbc6eb0..542009b 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
@@ -367,8 +367,6 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
} finally {
Map<String, Object> jobMap = new HashMap<>();
jobMap.put(AfterHandlingEvent.JOBMAP_KEY, new AfterHandlingEvent(
- true,
- true,
AuditElements.EventCategoryType.PUSH,
any.getType().getKind().name().toLowerCase(),
profile.getTask().getResource().getKey(),
http://git-wip-us.apache.org/repos/asf/syncope/blob/14fe5c45/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
index 20371b5..313a527 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
@@ -324,8 +324,6 @@ public class RealmPushResultHandlerImpl
} finally {
Map<String, Object> jobMap = new HashMap<>();
jobMap.put(AfterHandlingEvent.JOBMAP_KEY, new AfterHandlingEvent(
- true,
- true,
AuditElements.EventCategoryType.PUSH,
REALM_TYPE.toLowerCase(),
profile.getTask().getResource().getKey(),
[2/2] syncope git commit: Minor fixes;
including TogglePanel icon vertical align and modern veil
Posted by il...@apache.org.
Minor fixes; including TogglePanel icon vertical align and modern veil
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3a7cf682
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3a7cf682
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3a7cf682
Branch: refs/heads/master
Commit: 3a7cf682f2fae3cfa4051545bd532e0ff68207c8
Parents: a90d50e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jun 12 16:49:27 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jun 12 16:49:39 2017 +0200
----------------------------------------------------------------------
.../client/console/commons/Constants.java | 2 ++
.../syncope/client/console/pages/BasePage.java | 2 +-
.../console/panels/UserDirectoryPanel.java | 2 +-
.../console/topology/TopologyNodePanel.java | 3 ++-
.../wicket/markup/html/form/ActionPanel.java | 5 ++--
.../wicket/markup/html/form/ActionsPanel.java | 2 +-
.../markup/html/link/VeilPopupSettings.java | 3 ++-
.../META-INF/resources/css/syncopeConsole.css | 4 +++
.../core/logic/LogicInvocationHandler.java | 26 ++++++++++----------
.../api/dao/search/OrderByClause.java | 5 +++-
.../api/event/AfterHandlingEvent.java | 16 ------------
.../provisioning/java/AuditManagerImpl.java | 20 +++++++--------
.../notification/NotificationManagerImpl.java | 20 +++++++--------
.../pushpull/AbstractPushResultHandler.java | 2 --
.../pushpull/RealmPushResultHandlerImpl.java | 2 --
15 files changed, 51 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index e49f10d..588790d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -29,6 +29,8 @@ public final class Constants {
public static final String SYNCOPE = "syncope";
+ public static final String VEIL_INDICATOR_MARKUP_ID = "veil";
+
public static final String ACTIVITI_MODELER_CONTEXT = "activiti-modeler";
public static final String FLOWABLE_MODELER_CONTEXT = "flowable-modeler";
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
index 1a94309..55d8f9c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java
@@ -404,7 +404,7 @@ public class BasePage extends WebPage implements IAjaxIndicatorAware {
@Override
public String getAjaxIndicatorMarkupId() {
- return "veil";
+ return Constants.VEIL_INDICATOR_MARKUP_ID;
}
public NotificationPanel getNotificationPanel() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index 5a62063..dae614f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -128,7 +128,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient
@Override
protected List<IColumn<UserTO, String>> getColumns() {
final List<IColumn<UserTO, String>> columns = new ArrayList<>();
- final List<IColumn<UserTO, String>> prefcolumns = new ArrayList<IColumn<UserTO, String>>();
+ final List<IColumn<UserTO, String>> prefcolumns = new ArrayList<>();
columns.add(new KeyPropertyColumn<UserTO>(
new ResourceModel(Constants.KEY_FIELD_NAME, Constants.KEY_FIELD_NAME), Constants.KEY_FIELD_NAME));
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
index b563cca..2d81c3d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyNodePanel.java
@@ -19,6 +19,7 @@
package org.apache.syncope.client.console.topology;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.rest.ConnectorRestClient;
import org.apache.syncope.client.console.topology.TopologyNode.Kind;
import org.apache.syncope.client.console.topology.TopologyTogglePanel.UpdateEvent;
@@ -108,7 +109,7 @@ public class TopologyNodePanel extends Panel implements IAjaxIndicatorAware {
@Override
public String getAjaxIndicatorMarkupId() {
- return "veil";
+ return Constants.VEIL_INDICATOR_MARKUP_ID;
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
index 6f147c0..8eb3135 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.wicket.markup.html.form;
import java.io.Serializable;
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.console.wicket.markup.html.form.ActionLink.ActionType;
import org.apache.syncope.client.console.wicket.markup.html.link.VeilPopupSettings;
import org.apache.wicket.AttributeModifier;
@@ -108,7 +109,7 @@ public final class ActionPanel<T extends Serializable> extends Panel {
@Override
public String getAjaxIndicatorMarkupId() {
return disableIndicator || !action.getLink().isIndicatorEnabled()
- ? StringUtils.EMPTY : super.getAjaxIndicatorMarkupId();
+ ? StringUtils.EMPTY : Constants.VEIL_INDICATOR_MARKUP_ID;
}
}
: new IndicatingAjaxLink<Void>("action") {
@@ -124,7 +125,7 @@ public final class ActionPanel<T extends Serializable> extends Panel {
@Override
public String getAjaxIndicatorMarkupId() {
return disableIndicator || !action.getLink().isIndicatorEnabled()
- ? StringUtils.EMPTY : super.getAjaxIndicatorMarkupId();
+ ? StringUtils.EMPTY : Constants.VEIL_INDICATOR_MARKUP_ID;
}
};
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java
index 6c26aa9..71d342c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.java
@@ -50,7 +50,7 @@ public final class ActionsPanel<T extends Serializable> extends Panel {
@Override
protected void populateItem(final ListItem<Action<T>> item) {
- item.add(new ActionPanel<T>(ActionsPanel.this.model, item.getModelObject()));
+ item.add(new ActionPanel<>(ActionsPanel.this.model, item.getModelObject()));
}
}.setRenderBodyOnly(true));
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
index 6a766be..c85cfda 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/link/VeilPopupSettings.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.wicket.markup.html.link;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.wicket.markup.html.link.PopupSettings;
public class VeilPopupSettings extends PopupSettings {
@@ -26,7 +27,7 @@ public class VeilPopupSettings extends PopupSettings {
@Override
public String getPopupJavaScript() {
- return "document.getElementById('veil').style.display = 'block';"
+ return "document.getElementById('" + Constants.VEIL_INDICATOR_MARKUP_ID + "').style.display = 'block';"
+ super.getPopupJavaScript().substring(0, super.getPopupJavaScript().lastIndexOf("return false;"))
+ "var loop = setInterval(function() { "
+ " if(w.closed) {"
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
index a9f3848..da65a20 100644
--- a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
+++ b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
@@ -1137,6 +1137,10 @@ ul.menu li a {
cursor: pointer !important;
}
+ul.menu i {
+ width: 35px;
+}
+
.toggle-menu ul.menu li a {
padding: 0px;
text-align: left;
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java b/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java
index a70f3c0..38c5e92 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/LogicInvocationHandler.java
@@ -97,19 +97,19 @@ public class LogicInvocationHandler {
LOG.debug("After throwing {}.{}", clazz.getSimpleName(), event);
throw t;
} finally {
- Map<String, Object> jobMap = new HashMap<>();
- jobMap.put(AfterHandlingEvent.JOBMAP_KEY, new AfterHandlingEvent(
- notificationsAvailable,
- auditRequested,
- AuditElements.EventCategoryType.LOGIC,
- category,
- null,
- event,
- condition,
- before,
- output,
- input));
- AfterHandlingJob.schedule(scheduler, jobMap);
+ if (notificationsAvailable || auditRequested) {
+ Map<String, Object> jobMap = new HashMap<>();
+ jobMap.put(AfterHandlingEvent.JOBMAP_KEY, new AfterHandlingEvent(
+ AuditElements.EventCategoryType.LOGIC,
+ category,
+ null,
+ event,
+ condition,
+ before,
+ output,
+ input));
+ AfterHandlingJob.schedule(scheduler, jobMap);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
index 46a9d80..8d4b978 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/dao/search/OrderByClause.java
@@ -18,12 +18,15 @@
*/
package org.apache.syncope.core.persistence.api.dao.search;
+import java.io.Serializable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-public class OrderByClause {
+public class OrderByClause implements Serializable {
+
+ private static final long serialVersionUID = -1741826744085524716L;
public enum Direction {
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java
index b207cb9..2e2e44e 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/event/AfterHandlingEvent.java
@@ -27,10 +27,6 @@ public class AfterHandlingEvent implements Serializable {
public static final String JOBMAP_KEY = "AfterHandlingEvent";
- private final boolean notificationsAvailable;
-
- private final boolean auditRequested;
-
private final AuditElements.EventCategoryType type;
private final String category;
@@ -48,8 +44,6 @@ public class AfterHandlingEvent implements Serializable {
private final Object[] input;
public AfterHandlingEvent(
- final boolean notificationsAvailable,
- final boolean auditRequested,
final AuditElements.EventCategoryType type,
final String category,
final String subcategory,
@@ -59,8 +53,6 @@ public class AfterHandlingEvent implements Serializable {
final Object output,
final Object... input) {
- this.notificationsAvailable = notificationsAvailable;
- this.auditRequested = auditRequested;
this.type = type;
this.category = category;
this.subcategory = subcategory;
@@ -71,14 +63,6 @@ public class AfterHandlingEvent implements Serializable {
this.input = input;
}
- public boolean isNotificationsAvailable() {
- return notificationsAvailable;
- }
-
- public boolean isAuditRequested() {
- return auditRequested;
- }
-
public AuditElements.EventCategoryType getType() {
return type;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java
index 359538b..14180ec 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/AuditManagerImpl.java
@@ -80,17 +80,15 @@ public class AuditManagerImpl implements AuditManager {
@Override
public void audit(final AfterHandlingEvent event) {
- if (event.isAuditRequested()) {
- audit(
- event.getType(),
- event.getCategory(),
- event.getSubcategory(),
- event.getEvent(),
- event.getCondition(),
- event.getBefore(),
- event.getOutput(),
- event.getInput());
- }
+ audit(
+ event.getType(),
+ event.getCategory(),
+ event.getSubcategory(),
+ event.getEvent(),
+ event.getCondition(),
+ event.getBefore(),
+ event.getOutput(),
+ event.getInput());
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
index c438da3..1e6f531 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
@@ -279,17 +279,15 @@ public class NotificationManagerImpl implements NotificationManager {
@Override
public void createTasks(final AfterHandlingEvent event) {
- if (event.isNotificationsAvailable()) {
- createTasks(
- event.getType(),
- event.getCategory(),
- event.getSubcategory(),
- event.getEvent(),
- event.getCondition(),
- event.getBefore(),
- event.getOutput(),
- event.getInput());
- }
+ createTasks(
+ event.getType(),
+ event.getCategory(),
+ event.getSubcategory(),
+ event.getEvent(),
+ event.getCondition(),
+ event.getBefore(),
+ event.getOutput(),
+ event.getInput());
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
index bbc6eb0..542009b 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
@@ -367,8 +367,6 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
} finally {
Map<String, Object> jobMap = new HashMap<>();
jobMap.put(AfterHandlingEvent.JOBMAP_KEY, new AfterHandlingEvent(
- true,
- true,
AuditElements.EventCategoryType.PUSH,
any.getType().getKind().name().toLowerCase(),
profile.getTask().getResource().getKey(),
http://git-wip-us.apache.org/repos/asf/syncope/blob/3a7cf682/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
index 20371b5..313a527 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
@@ -324,8 +324,6 @@ public class RealmPushResultHandlerImpl
} finally {
Map<String, Object> jobMap = new HashMap<>();
jobMap.put(AfterHandlingEvent.JOBMAP_KEY, new AfterHandlingEvent(
- true,
- true,
AuditElements.EventCategoryType.PUSH,
REALM_TYPE.toLowerCase(),
profile.getTask().getResource().getKey(),