Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Mar 25, 2020 · 4f10065 · 4f10065
2 parents f97959a + b41f82f
commit 4f10065
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 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
@@ -137,8 +137,6 @@ protected Collection<SelectorOptions<GetOperationOptions>> buildGetOptions() {
     }
 
     protected void initOperationalButtons(RepeatingView repeatingView) {
-        super.initOperationalButtons(repeatingView);
-
         createSuspendButton(repeatingView);
         createResumeButton(repeatingView);
         createRunNowButton(repeatingView);

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
@@ -26,6 +26,9 @@
     <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
                 schemaLocation="http://midpoint.evolveum.com/xml/ns/public/common/common-3"/>
 
+    <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3"
+            schemaLocation="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3"/>
+
     <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/query-3"
                 schemaLocation="http://prism.evolveum.com/xml/ns/public/query-3">
         <xsd:annotation>
@@ -35,9 +38,6 @@
         </xsd:annotation>
     </xsd:import>
 
-    <xsd:import namespace="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3"
-                schemaLocation="http://midpoint.evolveum.com/xml/ns/public/model/scripting/extension-3"/>
-
     <xsd:import namespace="http://prism.evolveum.com/xml/ns/public/types-3"
                 schemaLocation="http://prism.evolveum.com/xml/ns/public/types-3">
         <xsd:annotation>
@@ -94,7 +94,7 @@
     <xsd:element name="freshnessInterval" type="xsd:long">
         <xsd:annotation>
             <xsd:documentation>
-                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

diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
@@ -138,22 +138,22 @@ private <F extends ObjectType> 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);
                 }