Merge remote-tracking branch 'origin/master'

Evolveum · Sep 4, 2023 · f7514cd · f7514cd
2 parents 4e130f7 + e4ce71e
commit f7514cd
Show file tree

Hide file tree

Showing 31 changed files with 158 additions and 56 deletions.
diff --git a/config/config-native.xml b/config/config-native.xml
@@ -50,6 +50,7 @@ https://github.com/Evolveum/midpoint/blob/master/repo/system-init/src/main/resou
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>

diff --git a/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss b/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
@@ -7,6 +7,10 @@
 
 .user-panel {
   border-bottom: 0 !important;
+
+  &.info-box {
+    min-height:70px;
+  }
 }
 
 .btn-default {

diff --git a/gui/admin-gui/src/frontend/scss/midpoint.scss b/gui/admin-gui/src/frontend/scss/midpoint.scss
@@ -1745,8 +1745,20 @@ span.yui-skin-sam {
   width: 600px !important;
 }
 
-.login-box {
+@mixin login-box {
   width: 400px !important;
+
+  & .login-card-body .spacer hr {
+    border-color:#dfdfdf;
+  }
+
+  & .login-card-body .spacer span {
+    color:#dfdfdf;
+  }
+
+  & .login-card-body .user-panel.info-box .image img {
+    width:2.4rem;
+  }
 }
 
 .info-box.activity-item-processing > .info-box-content > .progress-description {

diff --git a/...a/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAttributeVerification.html b/...a/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAttributeVerification.html
@@ -19,7 +19,7 @@
             <label wicket:id="attributeName"></label>
             <div wicket:id="attributeValue"/>
         </div>
-        <div>
+        <div class="mt-4">
             <input type="submit" class="btn btn-primary login-panel-control" wicket:message="value:PageBase.button.send" />
         </div>
     </form>

diff --git a/...va/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAuthenticationModule.html b/...va/com/evolveum/midpoint/gui/impl/page/login/module/PageAbstractAuthenticationModule.html
@@ -15,9 +15,9 @@
     <wicket:child/>
 
     <wicket:enclosure child="flowLinkContainer">
-        <div class="d-flex align-items-center my-2">
+        <div class="d-flex align-items-center my-2 py-1 spacer">
             <hr class="w-100" style="border-color: #818d98;">
-            <span class="mx-3 text-secondary">OR</span>
+            <span class="mx-3">OR</span>
             <hr class="w-100" style="border-color: #818d98;">
         </div>
 

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageArchetypeSelection.html b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageArchetypeSelection.html
@@ -20,8 +20,8 @@
                 <div class="card mb-0 simple-tile selectable" wicket:id="archetype"/>
             </wicket:container>
         </div>
-        <div>
-            <input type="submit" class="btn btn-primary mt-4 login-panel-control" wicket:message="value:PageBase.button.send" />
+        <div class="mt-4">
+            <input type="submit" class="btn btn-primary login-panel-control" wicket:message="value:PageBase.button.send" />
         </div>
     </form>
 </wicket:extend>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/module/PageLogin.html
@@ -17,9 +17,9 @@
             <div class="input-group d-flex login-panel-control">
                 <input wicket:id="username" name="username" type="text" class="form-control form-control-sm">
                 <div class="input-group-append">
-                    <div class="input-group-text">
-                        <span class="fas fa-user"></span>
-                    </div>
+                    <span class="input-group-text">
+                        <i class="fas fa-user"></i>
+                    </span>
                 </div>
             </div>
         </div>
@@ -30,9 +30,9 @@
             <div class="input-group d-flex login-panel-control">
                 <input name="password" type="password" class="form-control form-control-sm d-flex flex-wrap gap-2">
                 <div class="input-group-append">
-                    <div class="input-group-text">
-                        <span class="fas fa-lock"></span>
-                    </div>
+                    <span class="input-group-text">
+                        <i class="fas fa-lock"></i>
+                    </span>
                 </div>
             </div>
         </div>
@@ -45,8 +45,6 @@
         <div wicket:id="csrfField"/>
     </form>
 
-
-
 </wicket:extend>
 
 </html>
diff --git a/.../src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/IdentityDetailsPanel.html b/.../src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/IdentityDetailsPanel.html
@@ -8,27 +8,29 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div wicket:id="headerPanel" class="d-flex flex-wrap gap-2 w-100">
-        <div class="image col-md-2 mt-3">
-            <img wicket:id="photo" class="user-image img-circle elevation-2"/>
+    <div wicket:id="headerPanel" class="d-flex flex-wrap gap-1 w-100 align-items-center px-1">
+        <div class="image col-auto pl-2">
+            <img wicket:id="photo" class="user-image img-circle"/>
         </div>
-        <div class="info col-md-8">
-            <div class="text-lg" wicket:id="displayName"/>
-            <div class="text-md" wicket:id="archetypeLabel"/>
+        <div class="info col py-0">
+            <div class="text-md" wicket:id="displayName"/>
+            <div class="text-sm text-secondary" wicket:id="archetypeLabel"/>
         </div>
-        <a class="pull-right col-md-1 mt-3" wicket:id="expandButton">
+        <div class="col-auto">
+        <a class="btn btn-tool pull-right m-0" wicket:id="expandButton">
             <i wicket:id="arrowIcon"></i>
         </a>
+        </div>
     </div>
     <wicket:enclosure child="itemsPanel">
-        <div class="border-top w-100">
-            <div wicket:id="itemsPanel" class="d-flex flex-wrap gap-2 mt-2">
-                <label class="col-md-5" wicket:id="itemName"></label>
+        <div class="border-top d-flex flex-column pt-3 gap-2 w-100">
+            <div wicket:id="itemsPanel" class="d-flex flex-wrap gap-2">
+                <label class="col-md-4 m-0" wicket:id="itemName"></label>
                 <div wicket:id="itemValue"/>
             </div>
         </div>
-        <a wicket:id="confirmIdentity" class="d-flex btn btn-primary justify-content-center w-100 mt-2">
-            <i class="mt-1 mr-2 fa-fw fa fa-check" />
+        <a wicket:id="confirmIdentity" class="d-flex btn btn-primary align-items-center justify-content-center w-100 mt-2">
+            <i class="mr-2 fa fa-check" />
             <wicket:message key="PageIdentityRecovery.confirmIdentity"/>
         </a>
     </wicket:enclosure>

diff --git a/.../src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.html b/.../src/main/java/com/evolveum/midpoint/gui/impl/page/lostusername/PageIdentityRecovery.html
@@ -11,16 +11,19 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:extend>
-    <div wicket:id="recoveredIdentities" class="user-panel info-box my-3 pb-2 ">
-        <div wicket:id="detailsPanel" class="d-flex flex-wrap gap-2 w-100" />
+    <div class="d-flex flex-column gap-2">
+        <div wicket:id="recoveredIdentities" class="user-panel info-box mb-1">
+            <div wicket:id="detailsPanel" class="d-flex flex-wrap gap-2 w-100" />
+        </div>
     </div>
-    <div wicket:id="paging" class="d-flex gap-2 w-100 justify-content-center" />
+    <div wicket:id="paging" class="d-flex gap-2 w-100 justify-content-center mt-3 mb-1" />
     <div>
-        <a wicket:id="restartFlow" class="d-flex btn btn-default justify-content-center w-100 mt-4">
-            <i class="mt-1 mr-2 fa fa-sync-alt" />
+        <a wicket:id="restartFlow" class="d-flex btn btn-default justify-content-center w-100 mt-4 align-items-center">
+            <i class="mr-2 fa fa-sync-alt" />
             <wicket:message key="PageIdentityRecovery.restartFlow"/>
         </a>
-        <a wicket:id="registrationLink" class="d-flex justify-content-center w-100 mt-4">
+        <a wicket:id="registrationLink" class="d-flex btn btn-default justify-content-center w-100 mt-2 align-items-center">
+            <i class="mr-2 fa fa-solid fa-user-plus" />
             <wicket:message key="PageLogin.registerNewAccount"/>
         </a>
     </div>

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestMiscTasks.java
@@ -85,7 +85,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
                 ROLE_APPLICATION_1, ROLE_APPLICATION_2, ROLE_BUSINESS_1,
                 USER_1, USER_2);
 
-        if(isNativeRepository()){
+        if (isNativeRepository()) {
             initTestObjects(initTask, initResult, SESSION_ROLE_BASED, CLUSTER_ROLE_BASED);
         }
     }
@@ -648,12 +648,14 @@ public void test400RoleAnalysisClusteringBasic() throws Exception {
     }
 
     @Test
-    public void test410RoleAnalysisPatternDetectionBasic() throws CommonException {
+    public void test410RoleAnalysisPatternDetectionBasic() throws Exception {
         skipIfNotNativeRepository();
 
         Task task = getTestTask();
         OperationResult result = task.getResult();
 
+        initTestObjects(task, result, CLUSTER_ROLE_BASED);
+
         when("task is run");
         TASK_ROLE_ANALYSIS_PATTERN_DETECTION_BASIC.init(this, task, result);
         TASK_ROLE_ANALYSIS_PATTERN_DETECTION_BASIC.rerun(result); // asserts success

diff --git a/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml b/model/model-intest/src/test/resources/tasks/misc/cluster-role-based.xml
@@ -7,7 +7,6 @@
     <roleAnalysisSessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"
             relation="org:default"
             type="c:RoleAnalysisSessionType">
-        <!-- role_based_analysis_session -->
     </roleAnalysisSessionRef>
     <detectionOption>
         <minRolesOccupancy>10</minRolesOccupancy>

diff --git a/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml b/model/model-intest/src/test/resources/tasks/misc/task-role-analysis-clustering-basic.xml
@@ -13,7 +13,7 @@
     <activity>
         <work>
             <roleAnalysisClustering>
-                <sessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"/> <!-- random OID for now -->
+                <sessionRef oid="c0d74ad2-f92a-40f0-b661-3c0a6a5dc225"/>
             </roleAnalysisClustering>
         </work>
     </activity>

diff --git a/...model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml b/...model-intest/src/test/resources/tasks/misc/task-role-analysis-pattern-detection-basic.xml
@@ -13,7 +13,7 @@
     <activity>
         <work>
             <roleAnalysisPatternDetection>
-                <clusterRef oid="16a8b95a-8a37-4f91-b835-bb77670c2899"/> <!-- random OID for now -->
+                <clusterRef oid="16a8b95a-8a37-4f91-b835-bb77670c2899"/>
             </roleAnalysisPatternDetection>
         </work>
     </activity>

diff --git a/model/workflow-impl/src/test/resources/test-config.xml b/model/workflow-impl/src/test/resources/test-config.xml
@@ -39,6 +39,7 @@
             <scanDirectory>/C:/tmp</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>

diff --git a/pom.xml b/pom.xml
@@ -957,7 +957,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-databasetable</artifactId>
-                <version>1.5.1.0-SNAPSHOT</version>
+                <version>1.5.1.0-M1</version>
                 <exclusions>
                     <!-- Connectors may have dependencies on various versions of connector-common,
                          as they can be built against various versions of polygon.
@@ -975,7 +975,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-csv</artifactId>
-                <version>2.7-SNAPSHOT</version>
+                <version>2.7-M1</version>
                 <exclusions>
                     <!-- Connectors may have dependencies on various versions of connector-common,
                          as they can be built against various versions of polygon.

diff --git a/...d/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java b/...d/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummyMulti.java
@@ -58,7 +58,7 @@ public class TestUcfDummyMulti extends AbstractUcfDummyTest {
 
     private static final File CONNECTOR_FAKE = new File("src/test/resources/dummy-connector-fake-4.2.jar");
     private static final File MIDPOINT_HOME = new File("target/midpoint-home");
-    private static final File MIDPOINT_HOME_ICF = new File(MIDPOINT_HOME, "icf-connectors");
+    private static final File MIDPOINT_HOME_ICF = new File(MIDPOINT_HOME, "connid-connectors");
 
     @Test
     public void test000PrismContextSanity() {

diff --git a/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java b/repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventType.java
@@ -53,6 +53,8 @@ public enum AuditEventType {
     DISCOVER_OBJECT,
     INFORMATION_DISCLOSURE;
 
+
+
     public static AuditEventType fromSchemaValue(AuditEventTypeType event) {
         if (event == null) {
             return null;

diff --git a/repo/repo-sqale/src/test/resources/config-test.xml b/repo/repo-sqale/src/test/resources/config-test.xml
@@ -50,6 +50,7 @@
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
         </icf>
         <keystore>

diff --git a/repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml b/repo/repo-sql-impl-test/src/test/resources/config-test-datasource.xml
@@ -24,6 +24,7 @@
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
         </icf>
         <keystore>

diff --git a/repo/repo-sql-impl-test/src/test/resources/config-test.xml b/repo/repo-sql-impl-test/src/test/resources/config-test.xml
@@ -39,7 +39,9 @@
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
+
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore-test.jceks</keyStorePath>

diff --git a/repo/repo-test-util/src/main/resources/test-config-new-repo.xml b/repo/repo-test-util/src/main/resources/test-config-new-repo.xml
@@ -60,7 +60,7 @@
         </taskManager>
         <icf>
             <scanClasspath>true</scanClasspath>
-            <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>

diff --git a/repo/repo-test-util/src/main/resources/test-config-no-repo.xml b/repo/repo-test-util/src/main/resources/test-config-no-repo.xml
@@ -33,6 +33,7 @@
             <scanDirectory>/C:/tmp</scanDirectory>
             <scanDirectory>/var/tmp</scanDirectory>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>

diff --git a/repo/repo-test-util/src/main/resources/test-config.xml b/repo/repo-test-util/src/main/resources/test-config.xml
@@ -53,7 +53,7 @@
         </taskManager>
         <icf>
             <scanClasspath>true</scanClasspath>
-            <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>

diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
@@ -58,6 +58,7 @@ private void createMidpointHomeDirectories() {
 
         Path[] directories = {
                 midPointHomePath.resolve("icf-connectors"),
+                midPointHomePath.resolve("connid-connectors"),
                 midPointHomePath.resolve("idm-legacy"),
                 midPointHomePath.resolve("log"),
                 midPointHomePath.resolve("schema"),

diff --git a/repo/system-init/src/main/resources/config.xml b/repo/system-init/src/main/resources/config.xml
@@ -65,6 +65,7 @@ to a file, not its content, is the actual value.
         <icf>
             <scanClasspath>true</scanClasspath>
             <scanDirectory>${midpoint.home}/icf-connectors</scanDirectory>
+            <scanDirectory>${midpoint.home}/connid-connectors</scanDirectory>
         </icf>
         <keystore>
             <keyStorePath>${midpoint.home}/keystore.jceks</keyStorePath>

diff --git a/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/VerifyAction.java b/tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/VerifyAction.java
@@ -6,6 +6,18 @@
  */
 package com.evolveum.midpoint.ninja.action;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+
+import org.apache.commons.io.FileUtils;
+import org.jetbrains.annotations.NotNull;
+
 import com.evolveum.midpoint.ninja.action.verify.VerificationReporter;
 import com.evolveum.midpoint.ninja.action.worker.VerifyConsumerWorker;
 import com.evolveum.midpoint.ninja.impl.NinjaApplicationContextLevel;
@@ -16,18 +28,6 @@
 import com.evolveum.midpoint.schema.validator.UpgradeValidationResult;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 
-import org.apache.commons.io.FileUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-
 /**
  * Created by Viliam Repan (lazyman).
  */
@@ -96,10 +96,13 @@ public VerifyResult execute() throws Exception {
                 log.info("XML dump with delta for each item saved to '{}'", options.getOutput().getPath() + VerificationReporter.DELTA_FILE_NAME_SUFFIX);
             }
 
-            // todo this should not show when action is a part of complex action and next step is prepared automatically
             // FIXME: ADD links (do not display in batch mode)
             // FIXME: Could We could try to infer script name?
             if (context.isUserMode() && !partial) {
+                if (result.getCriticalCount() > 0) {
+                    log.info("");
+                    log.info("Critical issues should be fixed before upgrade as they could cause major problems after upgrade (e.g. prevent midpoint start).");
+                }
                 log.info("");
                 log.info("Please see documentation for use of verification report in upgrade process and modify it accordingly.");
                 log.info("After you've reviewed verification report and marked changes to skip you can continue upgrade process "