Switched directory from icf-* to connid-connectors

Signed-off-by: Tony Tkáčik <tonydamage@gmail.com>
Evolveum · Sep 4, 2023 · aabcd66 · aabcd66
1 parent 70423e2
commit aabcd66
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 3 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/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/...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
@@ -52,6 +52,8 @@ public enum AuditEventType {
 
     DISCOVER_OBJECT;
 
+
+
     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>