From 9af6b72d17881234ced3eed1c40061f526817b4f Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 25 Mar 2020 11:17:11 +0100 Subject: [PATCH 1/4] extension-3.xsd: removed import breaking jaxb schema on jdk8 + typo fix --- .../src/main/resources/xml/ns/public/model/extension-3.xsd | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd b/infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd index f25a6e69b5c..f9d94144c5c 100644 --- a/infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd +++ b/infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd @@ -35,9 +35,6 @@ - - @@ -94,7 +91,7 @@ - Interval in which the shadow will be considered fresh. It is conted from the last synchronization + Interval in which the shadow will be considered fresh. It is counted from the last synchronization of the shadow (any kind of synchronization). It is in milliseconds. If no value is specified then a default value will be used. If a negative value is specified then the shadow will never be considered fresh and it will be From 5819c1b6b03d86da87b5db8474751144f259e0a3 Mon Sep 17 00:00:00 2001 From: lskublik Date: Wed, 25 Mar 2020 13:45:09 +0100 Subject: [PATCH 2/4] adding of resource name to error message for resource dependency error (MID-5417) --- .../impl/lens/projector/DependencyProcessor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java index b8e19c87114..0ff82a28096 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java @@ -138,22 +138,22 @@ private LensProjectionContext determineProjectionWaveProv if (LOGGER.isTraceEnabled()) { LOGGER.trace(" processing dependency: {}: unsatisfied strict dependency", PrettyPrinter.prettyPrint(outDependency)); } - throw new PolicyViolationException("Unsatisfied strict dependency of account "+projectionContext.getResourceShadowDiscriminator()+ - " dependent on "+refDiscr+": Account not provisioned"); + throw new PolicyViolationException("Unsatisfied strict dependency in resource "+projectionContext.getResourceName()+"(oid:" + projectionContext.getResourceOid()+ + ") of account "+projectionContext.getResourceShadowDiscriminator()+" dependent on "+refDiscr+": Account not provisioned"); } else if (outDependencyStrictness == ResourceObjectTypeDependencyStrictnessType.LAX) { if (LOGGER.isTraceEnabled()) { LOGGER.trace(" processing dependency: {}: unsatisfied lax dependency", PrettyPrinter.prettyPrint(outDependency)); } // independent object not in the context, just ignore it - LOGGER.debug("Unsatisfied lax dependency of account "+projectionContext.getResourceShadowDiscriminator()+ - " dependent on "+refDiscr+"; dependency skipped"); + LOGGER.debug("Unsatisfied lax dependency in resource "+projectionContext.getResourceName()+"(oid:" + projectionContext.getResourceOid()+ + ") of account "+projectionContext.getResourceShadowDiscriminator()+" dependent on "+refDiscr+"; dependency skipped"); } else if (outDependencyStrictness == ResourceObjectTypeDependencyStrictnessType.RELAXED) { if (LOGGER.isTraceEnabled()) { LOGGER.trace(" processing dependency: {}: unsatisfied relaxed dependency", PrettyPrinter.prettyPrint(outDependency)); } // independent object not in the context, just ignore it - LOGGER.debug("Unsatisfied relaxed dependency of account "+projectionContext.getResourceShadowDiscriminator()+ - " dependent on "+refDiscr+"; dependency skipped"); + LOGGER.debug("Unsatisfied relaxed dependency in resource "+projectionContext.getResourceName()+"(oid:" + projectionContext.getResourceOid()+ + ") of account "+projectionContext.getResourceShadowDiscriminator()+" dependent on "+refDiscr+"; dependency skipped"); } else { throw new IllegalArgumentException("Unknown dependency strictness "+outDependency.getStrictness()+" in "+refDiscr); } From 5fb4a6807533b3f60dbb51ec80bcab33230544a0 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 25 Mar 2020 13:50:26 +0100 Subject: [PATCH 3/4] model/extension-3.xsd: scripting/extension-3 import is needed at startup --- .../src/main/resources/xml/ns/public/model/extension-3.xsd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd b/infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd index f9d94144c5c..deb768a28f0 100644 --- a/infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd +++ b/infra/schema/src/main/resources/xml/ns/public/model/extension-3.xsd @@ -26,6 +26,9 @@ + + From b41f82f27d5063d9d3d333cf73c9fb162ef0c476 Mon Sep 17 00:00:00 2001 From: kate Date: Wed, 25 Mar 2020 13:54:41 +0100 Subject: [PATCH 4/4] hide Change archetype button for task --- .../com/evolveum/midpoint/web/page/admin/server/PageTask.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java index ccc9d7a0db5..c946d671515 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java @@ -137,8 +137,6 @@ protected Collection> buildGetOptions() { } protected void initOperationalButtons(RepeatingView repeatingView) { - super.initOperationalButtons(repeatingView); - createSuspendButton(repeatingView); createResumeButton(repeatingView); createRunNowButton(repeatingView);