From 9cf92a0a32611e8eec2af4983ff4a0536023aff3 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Wed, 28 Aug 2019 11:06:41 +0200
Subject: [PATCH] Remove references to OpenLDAP

It is 389ds not OpenLDAP :)
---
 demo/complex2s/midpoint-objects/resources/ldap-main.xml       | 2 +-
 .../complex2s/midpoint-objects/roles/metarole-affiliation.xml | 4 ++--
 demo/complex2s/midpoint-objects/roles/metarole-course.xml     | 4 ++--
 demo/complex2s/midpoint-objects/roles/metarole-department.xml | 2 +-
 .../midpoint-objects/roles/metarole-grouper-group.xml         | 4 ++--
 .../midpoint-objects/roles/metarole-mailing-list.xml          | 4 ++--
 .../midpoint-objects/roles/metarole-midpoint-group.xml        | 4 ++--
 demo/complex2s/midpoint-objects/roles/role-ldap-basic.xml     | 2 +-
 demo/complex2s/tests/main.bats                                | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/demo/complex2s/midpoint-objects/resources/ldap-main.xml b/demo/complex2s/midpoint-objects/resources/ldap-main.xml
index bb7f645..c1251f0 100644
--- a/demo/complex2s/midpoint-objects/resources/ldap-main.xml
+++ b/demo/complex2s/midpoint-objects/resources/ldap-main.xml
@@ -19,7 +19,7 @@
 	xmlns:mr="http://prism.evolveum.com/xml/ns/public/matching-rule-3"
 	xmlns:cap="http://midpoint.evolveum.com/xml/ns/public/resource/capabilities-3">
 
-		<name>OpenLDAP (directory)</name>
+		<name>LDAP (directory)</name>
 
 		<connectorRef type="ConnectorType">
 			<filter>
diff --git a/demo/complex2s/midpoint-objects/roles/metarole-affiliation.xml b/demo/complex2s/midpoint-objects/roles/metarole-affiliation.xml
index aaef986..33aee68 100644
--- a/demo/complex2s/midpoint-objects/roles/metarole-affiliation.xml
+++ b/demo/complex2s/midpoint-objects/roles/metarole-affiliation.xml
@@ -14,14 +14,14 @@
     </inducement>
     <inducement id="2">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <kind>entitlement</kind>
             <intent>affiliation-group</intent>
         </construction>
     </inducement>
     <inducement id="3">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <association>
                 <c:ref>ri:group</c:ref>
                 <outbound>
diff --git a/demo/complex2s/midpoint-objects/roles/metarole-course.xml b/demo/complex2s/midpoint-objects/roles/metarole-course.xml
index b1acba8..2fcda2f 100644
--- a/demo/complex2s/midpoint-objects/roles/metarole-course.xml
+++ b/demo/complex2s/midpoint-objects/roles/metarole-course.xml
@@ -14,14 +14,14 @@
     </inducement>
     <inducement id="2">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <kind>entitlement</kind>
             <intent>course-group</intent>
         </construction>
     </inducement>
     <inducement id="3">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <association>
                 <c:ref>ri:group</c:ref>
                 <outbound>
diff --git a/demo/complex2s/midpoint-objects/roles/metarole-department.xml b/demo/complex2s/midpoint-objects/roles/metarole-department.xml
index 4b8ed2b..4ebe378 100644
--- a/demo/complex2s/midpoint-objects/roles/metarole-department.xml
+++ b/demo/complex2s/midpoint-objects/roles/metarole-department.xml
@@ -14,7 +14,7 @@
     </inducement>
     <inducement id="2">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP for Grouper (i-data) -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <attribute>
                 <ref>ri:businessCategory</ref>
                 <outbound>
diff --git a/demo/complex2s/midpoint-objects/roles/metarole-grouper-group.xml b/demo/complex2s/midpoint-objects/roles/metarole-grouper-group.xml
index 34df300..25229c0 100644
--- a/demo/complex2s/midpoint-objects/roles/metarole-grouper-group.xml
+++ b/demo/complex2s/midpoint-objects/roles/metarole-grouper-group.xml
@@ -14,7 +14,7 @@
     </inducement>
     <inducement id="2">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <kind>entitlement</kind>
             <intent>generic-group</intent>
         </construction>
@@ -22,7 +22,7 @@
     </inducement>
     <inducement id="3">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <association>
                 <c:ref>ri:group</c:ref>
                 <outbound>
diff --git a/demo/complex2s/midpoint-objects/roles/metarole-mailing-list.xml b/demo/complex2s/midpoint-objects/roles/metarole-mailing-list.xml
index e5a680c..6d90176 100644
--- a/demo/complex2s/midpoint-objects/roles/metarole-mailing-list.xml
+++ b/demo/complex2s/midpoint-objects/roles/metarole-mailing-list.xml
@@ -14,7 +14,7 @@
     </inducement>
     <inducement id="2">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <kind>entitlement</kind>
             <intent>generic-group</intent>
         </construction>
@@ -22,7 +22,7 @@
     </inducement>
     <inducement id="3">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <association>
                 <c:ref>ri:group</c:ref>
                 <outbound>
diff --git a/demo/complex2s/midpoint-objects/roles/metarole-midpoint-group.xml b/demo/complex2s/midpoint-objects/roles/metarole-midpoint-group.xml
index a2a2c9a..6c1f2ce 100644
--- a/demo/complex2s/midpoint-objects/roles/metarole-midpoint-group.xml
+++ b/demo/complex2s/midpoint-objects/roles/metarole-midpoint-group.xml
@@ -11,14 +11,14 @@
     <name>metarole-midpoint-group</name>
     <inducement id="1">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP for Grouper (i-data) -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <kind>entitlement</kind>
             <intent>midpoint-group</intent>
         </construction>
     </inducement>
     <inducement id="2">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP for Grouper (i-data) -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
             <association>
                 <c:ref>ri:group</c:ref>
                 <outbound>
diff --git a/demo/complex2s/midpoint-objects/roles/role-ldap-basic.xml b/demo/complex2s/midpoint-objects/roles/role-ldap-basic.xml
index 3efa968..81c4b4d 100644
--- a/demo/complex2s/midpoint-objects/roles/role-ldap-basic.xml
+++ b/demo/complex2s/midpoint-objects/roles/role-ldap-basic.xml
@@ -11,7 +11,7 @@
     <name>role-ldap-basic</name>
     <inducement id="1">
         <construction>
-            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
+            <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- LDAP -->
         </construction>
         <order>1</order>
     </inducement>
diff --git a/demo/complex2s/tests/main.bats b/demo/complex2s/tests/main.bats
index ecfb6be..4a781f7 100644
--- a/demo/complex2s/tests/main.bats
+++ b/demo/complex2s/tests/main.bats
@@ -78,7 +78,7 @@ load ../../../library
     search_and_check_object orgs courses
     search_and_check_object orgs departments
 
-    search_and_check_object resources "OpenLDAP (directory)"
+    search_and_check_object resources "LDAP (directory)"
     search_and_check_object resources "Grouper Resource"
     search_and_check_object resources "SQL SIS courses (sources)"
     search_and_check_object resources "SQL SIS persons (sources)"