From ef8edacbc334dd3fdd2fce05ac2a45b704b400f5 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Mon, 20 Aug 2018 22:39:57 +0200 Subject: [PATCH] Update midPoint objects after architecture change --- .../midpoint-objects/linux.properties | 14 +- .../midpoint-objects/resources/ldap-edu.xml | 418 ------------------ .../{ldap-grouper.xml => ldap-main.xml} | 56 ++- .../resources/scriptedsql-grouper.xml | 4 +- .../resources/scriptedsql-sis-courses.xml | 6 +- .../resources/scriptedsql-sis-persons.xml | 379 ++++++++++++++++ .../roles/metarole-course.xml | 2 +- .../roles/metarole-generic-group.xml | 2 +- 8 files changed, 427 insertions(+), 454 deletions(-) delete mode 100644 grouper-midpoint/midpoint-objects/resources/ldap-edu.xml rename grouper-midpoint/midpoint-objects/resources/{ldap-grouper.xml => ldap-main.xml} (91%) create mode 100644 grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-persons.xml diff --git a/grouper-midpoint/midpoint-objects/linux.properties b/grouper-midpoint/midpoint-objects/linux.properties index 5e9ae01..4b729c9 100644 --- a/grouper-midpoint/midpoint-objects/linux.properties +++ b/grouper-midpoint/midpoint-objects/linux.properties @@ -1,8 +1,6 @@ -s-data.ldap.host=s-data -s-data.ldap.port=389 -s-data.db.host=s-data -s-data.db.port=3306 -i-data.ldap.host=i-data -i-data.ldap.port=389 -g-data.db.host=g-data -g-data.db.port=3306 +sources.db.host=sources +sources.db.port=3306 +directory.ldap.host=directory +directory.ldap.port=389 +grouper.db.host=grouper-data +grouper.db.port=3306 diff --git a/grouper-midpoint/midpoint-objects/resources/ldap-edu.xml b/grouper-midpoint/midpoint-objects/resources/ldap-edu.xml deleted file mode 100644 index 324dab2..0000000 --- a/grouper-midpoint/midpoint-objects/resources/ldap-edu.xml +++ /dev/null @@ -1,418 +0,0 @@ - - - - - - - - - OpenLDAP edu (s-data) - - - - - c:connectorType - com.evolveum.polygon.connector.ldap.LdapConnector - - - - - - - $(s-data.ldap.port) - $(s-data.ldap.host) - dc=internet2,dc=edu - cn=Directory Manager - - password - - nsUniqueId - auto - uid - memberOf - createTimestamp - nsAccountLock - - - - - false - false - false - - - - - - ri:inetOrgPerson - ri:eduPerson - ri:groupOfUniqueNames - ri:groupOfNames - ri:organizationalUnit - - - - - - account - Normal Account - true - ri:inetOrgPerson - ri:eduPerson - - ri:dn - Distinguished Name - - 0 - - mr:stringIgnoreCase - - - extension/ldap_dn - - - - strong - - - RoleType - c89f31dd-8d4f-4e0a-82cb-58ff9d8c1b2f - - grouper-basic - - - - - assignment - - - - - - - - - - ri:cn - Common Name - - 0 - - - - fullName - - - - - ri:sn - Surname - - 0 - - - - familyName - - - - - ri:givenName - Given Name - - - givenName - - - - - ri:uid - Login Name - mr:stringIgnoreCase - - - name - - - - - ri:mail - Mail - mr:stringIgnoreCase - - - emailAddress - - - - - ri:employeeNumber - - - employeeNumber - - - - - ri:businessCategory - - strong - - - OrgType - - - name - - - - - - true - - - - - - - name - - - - - - - - displayName - - - - - - OrgType - bee44c51-2469-411d-bac7-695728e9c241 - - - - assignment - - - - - - - - identifier - - - - - department - - - subtype - - - - - department - - - - - assignment - - - - - - - - - - ri:eduPersonAffiliation - - strong - - - RoleType - - - name - - - - - - true - - - - - - - name - - - - - - - - displayName - - - - - - - - identifier - - - - - affiliation - - - subtype - - - - - affiliation - - - - - assignment - - - - - - - - - - - - http://prism.evolveum.com/xml/ns/public/matching-rule-3#stringIgnoreCase - attributes/ri:dn - cn=root,dc=internet2,dc=edu - - - - - - - - - - true - - - - name - - - declare namespace ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"; - $account/attributes/ri:uid - - - - - - - linked - true - - - deleted - true - - http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink - - - - unlinked - true - - http://midpoint.evolveum.com/xml/ns/public/model/action-3#link - - - - unmatched - true - - http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus - - - - - - - - diff --git a/grouper-midpoint/midpoint-objects/resources/ldap-grouper.xml b/grouper-midpoint/midpoint-objects/resources/ldap-main.xml similarity index 91% rename from grouper-midpoint/midpoint-objects/resources/ldap-grouper.xml rename to grouper-midpoint/midpoint-objects/resources/ldap-main.xml index e8b883e..0d8af80 100644 --- a/grouper-midpoint/midpoint-objects/resources/ldap-grouper.xml +++ b/grouper-midpoint/midpoint-objects/resources/ldap-main.xml @@ -20,7 +20,7 @@ - OpenLDAP for Grouper (i-data) + OpenLDAP (directory) @@ -36,8 +36,8 @@ xmlns:icfcldap="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/com.evolveum.polygon.connector.ldap.LdapConnector"> - $(i-data.ldap.port) - $(i-data.ldap.host) + $(directory.ldap.port) + $(directory.ldap.host) dc=internet2,dc=edu cn=Directory Manager @@ -80,14 +80,23 @@ ri:dn Distinguished Name - - 0 - + + 0 + + false mr:stringIgnoreCase + strong - extension/ldap_dn + name + + + @@ -96,7 +105,9 @@ 0 + false + strong fullName @@ -105,10 +116,12 @@ ri:sn Surname - - 0 - + + 0 + + false + strong familyName @@ -117,7 +130,12 @@ ri:givenName Given Name + + 0 + + false + strong givenName @@ -126,8 +144,10 @@ ri:uid Login Name + false mr:stringIgnoreCase + strong name @@ -137,7 +157,9 @@ ri:mail Mail mr:stringIgnoreCase + false + strong emailAddress @@ -145,7 +167,9 @@ ri:employeeNumber + false + strong employeeNumber @@ -161,19 +185,9 @@ false - ri:courseGroup - Course-related groups membership + ri:group entitlement course-group - objectToSubject - ri:uniqueMember - ri:dn - - - false - ri:genericGroup - Generic groups membership - entitlement generic-group objectToSubject ri:uniqueMember diff --git a/grouper-midpoint/midpoint-objects/resources/scriptedsql-grouper.xml b/grouper-midpoint/midpoint-objects/resources/scriptedsql-grouper.xml index 0405261..b3e97da 100644 --- a/grouper-midpoint/midpoint-objects/resources/scriptedsql-grouper.xml +++ b/grouper-midpoint/midpoint-objects/resources/scriptedsql-grouper.xml @@ -18,8 +18,8 @@ - $(g-data.db.host) - $(g-data.db.port) + $(grouper.db.host) + $(grouper.db.port) root diff --git a/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-courses.xml b/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-courses.xml index caf6afd..8863b2a 100644 --- a/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-courses.xml +++ b/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-courses.xml @@ -18,14 +18,14 @@ - $(s-data.db.host) - $(s-data.db.port) + $(sources.db.host) + $(sources.db.port) root - grouper + sis GROOVY diff --git a/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-persons.xml b/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-persons.xml new file mode 100644 index 0000000..c09d793 --- /dev/null +++ b/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-persons.xml @@ -0,0 +1,379 @@ + + + + + SQL SIS persons (sources) + + + + + connectorType + net.tirasa.connid.bundles.db.scriptedsql.ScriptedSQLConnector + + + + + + + + $(sources.db.host) + $(sources.db.port) + + root + + + + sis + + GROOVY + + /opt/midpoint/var/res/sis-persons/SearchScript.groovy + /opt/midpoint/var/res/sis-persons/TestScript.groovy + /opt/midpoint/var/res/sis-persons/SchemaScript.groovy + + true + + + + + + org.mariadb.jdbc.Driver + jdbc:mysql://%h:%p/%d?useUnicode=true&characterEncoding=utf8&connectionCollation=utf8_bin + true + true + false + false + + + + + + + + + + + account + Normal Account + true + ri:AccountObjectClass + + ri:uid + UID + + + name + + + + strong + + + RoleType + c89f31dd-8d4f-4e0a-82cb-58ff9d8c1b2f + + grouper-basic + + + + + assignment + + + + + + + + + + ri:fullName + Full Name + + + fullName + + + + + ri:surname + Surname + + + familyName + + + + + ri:givenName + Given Name + + + givenName + + + + + ri:mail + Mail + mr:stringIgnoreCase + + + emailAddress + + + + + + ri:department + + strong + + + OrgType + + + name + + + + + + true + + + + + + + name + + + + + + + + displayName + + + + + + OrgType + bee44c51-2469-411d-bac7-695728e9c241 + + + + assignment + + + + + + + + identifier + + + + + department + + + subtype + + + + + department + + + + + assignment + + + + + + + + + + ri:affiliation + + strong + + + RoleType + + + name + + + + + + true + + + + + + + name + + + + + + + + displayName + + + + + + + + identifier + + + + + affiliation + + + subtype + + + + + affiliation + + + + + assignment + + + + + + + + + + + + + + true + + + + name + + + declare namespace ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"; + $account/attributes/ri:uid + + + + + + + linked + true + + + deleted + true + + http://midpoint.evolveum.com/xml/ns/public/model/action-3#unlink + + + + + unlinked + true + + http://midpoint.evolveum.com/xml/ns/public/model/action-3#link + + + + unmatched + true + + http://midpoint.evolveum.com/xml/ns/public/model/action-3#addFocus + + + + + + + diff --git a/grouper-midpoint/midpoint-objects/roles/metarole-course.xml b/grouper-midpoint/midpoint-objects/roles/metarole-course.xml index 094f92f..3e26105 100644 --- a/grouper-midpoint/midpoint-objects/roles/metarole-course.xml +++ b/grouper-midpoint/midpoint-objects/roles/metarole-course.xml @@ -20,7 +20,7 @@ - ri:courseGroup + ri:group diff --git a/grouper-midpoint/midpoint-objects/roles/metarole-generic-group.xml b/grouper-midpoint/midpoint-objects/roles/metarole-generic-group.xml index 3a6df91..f0e93c5 100644 --- a/grouper-midpoint/midpoint-objects/roles/metarole-generic-group.xml +++ b/grouper-midpoint/midpoint-objects/roles/metarole-generic-group.xml @@ -20,7 +20,7 @@ - ri:genericGroup + ri:group