diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java index 7a09e9f6b..1dda88991 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addchildren/AddChildren.java @@ -66,6 +66,7 @@ private ActionResult process(Context context, boolean execute) { LOGGER.info("Adding authorizables {} to group with id={}", String.join(", ", authorizableIds), group.getID()); } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); return actionResult; } @@ -101,7 +102,7 @@ private ActionResult process(Context context, boolean execute) { } if (actionResult.getStatus() == Status.ERROR) { - actionResult.logError("Execution interrupted"); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java index c16756121..087b0876c 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/addparents/AddParents.java @@ -65,6 +65,7 @@ private ActionResult process(Context context, boolean execute) { actionResult.setAuthorizable(authorizable.getID()); } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); return actionResult; } @@ -101,7 +102,7 @@ private ActionResult process(Context context, boolean execute) { } if (actionResult.getStatus() == Status.ERROR) { - actionResult.logError("Execution interrupted"); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java index 1813db825..011d08835 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/allow/Allow.java @@ -27,6 +27,7 @@ import com.cognifide.apm.main.permissions.PermissionActionHelper; import com.cognifide.apm.main.permissions.Restrictions; import com.cognifide.apm.main.permissions.exceptions.PermissionException; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import com.cognifide.apm.main.utils.PathUtils; import java.util.Collections; @@ -103,11 +104,14 @@ private ActionResult process(Context context, boolean simulate) { actionResult.logWarning("Path " + path + " not found"); } else { actionResult.logError("Path " + path + " not found"); - return actionResult; } } catch (RepositoryException | PermissionException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java index c5540d887..d16e8746c 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/Purge.java @@ -25,6 +25,7 @@ import com.cognifide.apm.api.actions.Message; import com.cognifide.apm.api.exceptions.ActionExecutionException; import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import com.cognifide.apm.main.utils.PathUtils; import java.util.HashSet; @@ -87,6 +88,9 @@ private ActionResult process(Context context, boolean execute) { actionResult.logError(MessagingUtils.createMessage(e)); } + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java index 409f585ee..5cbd373ea 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/clearpermissions/RemoveAll.java @@ -25,6 +25,7 @@ import com.cognifide.apm.api.exceptions.ActionExecutionException; import com.cognifide.apm.api.status.Status; import com.cognifide.apm.main.permissions.utils.JackrabbitAccessControlListUtil; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import com.cognifide.apm.main.utils.PathUtils; import java.security.Principal; @@ -73,6 +74,10 @@ private ActionResult process(final Context context, boolean execute) { } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java index af960071f..2d7bef383 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/createauthorizable/CreateAuthorizable.java @@ -24,6 +24,7 @@ import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.status.Status; import com.cognifide.apm.main.actions.forauthorizable.ForAuthorizable; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import javax.jcr.RepositoryException; import org.apache.jackrabbit.api.security.user.Authorizable; @@ -83,6 +84,8 @@ public ActionResult process(Context context, boolean simulate) { if (actionResult.getStatus() != Status.ERROR) { ActionResult forAuthorizableActionResult = new ForAuthorizable(id, false, createStrategy == CreateAuthorizableStrategy.GROUP).process(context); actionResult.changeStatus(forAuthorizableActionResult.getStatus(), forAuthorizableActionResult.getMessages().get(0).getText()); + } else { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java index 18fc9c14c..61892ba7e 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deletegroup/DeleteGroup.java @@ -25,6 +25,7 @@ import com.cognifide.apm.api.exceptions.ActionExecutionException; import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException; import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import java.util.List; import javax.jcr.RepositoryException; @@ -72,7 +73,7 @@ private ActionResult process(Context context, boolean execute) { } if (actionResult.getStatus() == Status.ERROR) { - actionResult.logError("Execution interrupted"); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java index 902230842..c2bc005fa 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/DestroyUser.java @@ -24,8 +24,10 @@ import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.exceptions.ActionExecutionException; import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException; +import com.cognifide.apm.api.status.Status; import com.cognifide.apm.main.actions.clearpermissions.Purge; import com.cognifide.apm.main.actions.removeparents.RemoveParents; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import java.util.ArrayList; import java.util.Collections; @@ -67,6 +69,10 @@ public ActionResult simulate(Context context) { actionResult = context.createActionResult(); actionResult.logWarning(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } @@ -91,6 +97,10 @@ public ActionResult execute(Context context) { actionResult = context.createActionResult(); actionResult.logWarning(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java index f48eae787..6b3928ac9 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deleteuser/RemoveUser.java @@ -25,6 +25,7 @@ import com.cognifide.apm.api.exceptions.ActionExecutionException; import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException; import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import java.util.List; import javax.jcr.RepositoryException; @@ -71,7 +72,7 @@ private ActionResult process(Context context, boolean execute) { } if (actionResult.getStatus() == Status.ERROR) { - actionResult.logError("Execution interrupted"); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java index 4f5545165..6fab3ae33 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/deny/Deny.java @@ -27,6 +27,7 @@ import com.cognifide.apm.main.permissions.PermissionActionHelper; import com.cognifide.apm.main.permissions.Restrictions; import com.cognifide.apm.main.permissions.exceptions.PermissionException; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import com.cognifide.apm.main.utils.PathUtils; import java.util.ArrayList; @@ -108,6 +109,10 @@ private ActionResult process(Context context, boolean simulate) { } catch (RepositoryException | PermissionException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java index 6d89da22b..6b79ccd1b 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/forauthorizable/ForAuthorizable.java @@ -24,6 +24,8 @@ import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.exceptions.ActionExecutionException; import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException; +import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import javax.jcr.RepositoryException; import org.apache.jackrabbit.api.security.user.Group; @@ -76,6 +78,10 @@ public ActionResult process(Context context) { actionResult.logError(MessagingUtils.createMessage(e)); } } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java index f7194bb49..f2ddb9dd0 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildren/RemoveChildren.java @@ -25,6 +25,7 @@ import com.cognifide.apm.api.exceptions.ActionExecutionException; import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException; import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import java.util.List; import javax.jcr.RepositoryException; @@ -62,6 +63,7 @@ private ActionResult process(Context context, boolean execute) { LOGGER.info("Removing authorizables {} from group with id={}", String.join(", ", authorizableIds), group.getID()); } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); return actionResult; } @@ -82,7 +84,7 @@ private ActionResult process(Context context, boolean execute) { } if (actionResult.getStatus() == Status.ERROR) { - actionResult.logError("Execution interrupted"); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java index 8dab06548..7a0d3879e 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removechildrengroups/ClearFromGroupDetacher.java @@ -22,6 +22,8 @@ import com.cognifide.apm.api.actions.ActionResult; import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.exceptions.ActionExecutionException; +import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import java.util.Iterator; import javax.jcr.RepositoryException; @@ -61,6 +63,10 @@ public ActionResult detachMembersFromGroup() { } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } @@ -76,6 +82,10 @@ public ActionResult detachAuthorizableFromParents() { } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java index 5d46006ee..5f84f7f0e 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeparents/RemoveParents.java @@ -25,6 +25,7 @@ import com.cognifide.apm.api.exceptions.ActionExecutionException; import com.cognifide.apm.api.exceptions.AuthorizableNotFoundException; import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import java.util.List; import javax.jcr.RepositoryException; @@ -65,6 +66,7 @@ public ActionResult process(Context context, boolean execute) { LOGGER.info("Removing authorizable with id={} from groups {}", authorizable.getID(), String.join(", ", groupIds)); } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); return actionResult; } @@ -89,7 +91,7 @@ public ActionResult process(Context context, boolean execute) { } if (actionResult.getStatus() == Status.ERROR) { - actionResult.logError("Execution interrupted"); + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); } return actionResult; } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java index 7978a2eb6..8c79eef9f 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/removeproperty/RemoveProperty.java @@ -23,6 +23,8 @@ import com.cognifide.apm.api.actions.ActionResult; import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.exceptions.ActionExecutionException; +import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import javax.jcr.RepositoryException; import org.apache.jackrabbit.api.security.user.Authorizable; @@ -64,6 +66,10 @@ private ActionResult process(final Context context, boolean simulate) { } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/Save.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/Save.java index 4285c390f..fbd29dbe1 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/Save.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/save/Save.java @@ -23,6 +23,8 @@ import com.cognifide.apm.api.actions.ActionResult; import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.actions.SessionSavingMode; +import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import javax.jcr.RepositoryException; @@ -49,6 +51,10 @@ private ActionResult process(final Context context, boolean execute) { } catch (final RepositoryException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java index ad3fb7f8d..275366374 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/sessionsave/SessionSave.java @@ -24,6 +24,8 @@ import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.actions.SessionSavingMode; import com.cognifide.apm.api.actions.SessionSavingPolicy; +import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; public class SessionSave implements Action { @@ -56,6 +58,10 @@ private ActionResult process(final Context context, boolean execute) { actionResult.logError(MessagingUtils.createMessage(e)); } } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java index a11e8576d..269fbda33 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setpassword/SetPassword.java @@ -23,6 +23,8 @@ import com.cognifide.apm.api.actions.ActionResult; import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.exceptions.ActionExecutionException; +import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import javax.jcr.RepositoryException; import org.apache.jackrabbit.api.security.user.User; @@ -62,6 +64,10 @@ private ActionResult process(final Context context, boolean execute) { } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java index ac73cd943..8332c53cd 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/actions/setproperty/SetProperty.java @@ -23,6 +23,8 @@ import com.cognifide.apm.api.actions.ActionResult; import com.cognifide.apm.api.actions.Context; import com.cognifide.apm.api.exceptions.ActionExecutionException; +import com.cognifide.apm.api.status.Status; +import com.cognifide.apm.main.utils.ActionUtils; import com.cognifide.apm.main.utils.MessagingUtils; import javax.jcr.RepositoryException; import javax.jcr.Value; @@ -72,6 +74,10 @@ private ActionResult process(final Context context, boolean simulate) { } catch (RepositoryException | ActionExecutionException e) { actionResult.logError(MessagingUtils.createMessage(e)); } + + if (actionResult.getStatus() == Status.ERROR) { + actionResult.logError(ActionUtils.EXECUTION_INTERRUPTED_MSG); + } return actionResult; } } diff --git a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java index 9a66f7429..966c4fcc3 100644 --- a/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java +++ b/app/aem/actions.main/src/main/java/com/cognifide/apm/main/utils/ActionUtils.java @@ -29,7 +29,7 @@ public final class ActionUtils { - public static final String ASSERTION_FAILED_MSG = "Assertion failed"; + public static final String EXECUTION_INTERRUPTED_MSG = "Execution interrupted"; private ActionUtils() { } diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/dashboard/css/styles.less b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/dashboard/css/styles.less index 0e84c72c3..6aa8904ed 100644 --- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/dashboard/css/styles.less +++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/dashboard/css/styles.less @@ -17,18 +17,18 @@ * limitations under the License. * =========================LICENSE_END================================== */ - .foundation-layout-panel-content { coral-card-asset { background-color: #ffffff; color: #e0e0e0; + coral-icon { font-size: 100px; text-align: center; } } + coral-card-content { background-color: #e0e0e0; } } - diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/history/css/history.less b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/history/css/history.less index 2bf4712b3..26c823f60 100644 --- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/history/css/history.less +++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/history/css/history.less @@ -17,7 +17,6 @@ * limitations under the License. * =========================LICENSE_END================================== */ - .summary { background: url(../img/icons/summary.png) no-repeat center left; } @@ -28,7 +27,8 @@ .last-dry-execution-status, .last-execution-status { vertical-align: middle; + .instance { text-transform: capitalize; } -} \ No newline at end of file +} diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/references/css/references.less b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/references/css/references.less index 5dcd2c829..3b52d05c1 100644 --- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/references/css/references.less +++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/references/css/references.less @@ -17,18 +17,17 @@ * limitations under the License. * =========================LICENSE_END================================== */ - .apm-documentation { padding: 0 15px; - .coral-Table-body { + .coral-Table-body, ._coral-Table-body { tr.even { - .coral-Table-cell { + .coral-Table-cell, ._coral-Table-cell { background-color: #e6e6e6; } } - .coral-Table-cell.argument-cell { + .coral-Table-cell.argument-cell, ._coral-Table-cell.argument-cell { border-left: 0px; border-right: 0px; @@ -62,4 +61,4 @@ padding: 5px 0 5px 30px; } } -} \ No newline at end of file +} diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/css/styles.less b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/css/styles.less index bb770c978..ee6ad51f8 100644 --- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/css/styles.less +++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/scripts/css/styles.less @@ -17,16 +17,17 @@ * limitations under the License. * =========================LICENSE_END================================== */ -.coral-Table-cell { +.coral-Table-cell, ._coral-Table-cell { a ~ time { display: inline-block; - margin: 10px 0 0 10px; + margin-left: 10px; } } + .granite-collection-selectionbar { z-index: 100; } #view-root { height: 100%; -} \ No newline at end of file +} diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/summary/css/styles.less b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/summary/css/styles.less index 450c81360..9856cb6b9 100644 --- a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/summary/css/styles.less +++ b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/summary/css/styles.less @@ -17,9 +17,9 @@ * limitations under the License. * =========================LICENSE_END================================== */ -.coral-Table-body { +.coral-Table-body, ._coral-Table-body { .entry-error { - .coral-Table-cell { + .coral-Table-cell, ._coral-Table-cell { background-color: rgba(221, 52, 52, 0.7); } }