From 1fd97ef81cd40b496bd49c1ca0b6023d75988935 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Wed, 6 Nov 2019 18:38:48 +0100
Subject: [PATCH] Remove etc:midpointGroups and midpoint stem

The "supergroup" is now obsolete and was removed. It temporarily stays
as a parameter for Grouper connector but we can specify any existing
group there, as it is used solely for the "test resource" operation.
---
 demo/grouper/add-ref-groups.gsh                        |  5 -----
 .../grouper_daemon/container_files/tmp/initialize.gsh  | 10 ----------
 .../functionLibraries/function-library-grouper.xml     |  4 ----
 .../midpoint-objects/resources/resource-grouper.xml    |  6 ++----
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/demo/grouper/add-ref-groups.gsh b/demo/grouper/add-ref-groups.gsh
index 7697f99..b4561f9 100644
--- a/demo/grouper/add-ref-groups.gsh
+++ b/demo/grouper/add-ref-groups.gsh
@@ -16,11 +16,6 @@ def addGroups(gs,stem,owner,regexp) {
 }
 
 gs = GrouperSession.startRootSession()
-def supergroup = GroupFinder.findByName(gs, "etc:midpointGroups", true)
 def cs = GroupFinder.findByName(gs, "app:cs", true)
 
-addGroups(gs, StemFinder.findByName(gs, 'ref:affiliation'), supergroup, null)
-addGroups(gs, StemFinder.findByName(gs, 'ref:dept'), supergroup, null)
-addGroups(gs, StemFinder.findByName(gs, 'ref:course'), supergroup, null)
-
 addGroups(gs, StemFinder.findByName(gs, 'ref:course'), cs, /CS.*/)
diff --git a/demo/grouper/grouper_daemon/container_files/tmp/initialize.gsh b/demo/grouper/grouper_daemon/container_files/tmp/initialize.gsh
index 2d1b83a..67ebc1a 100644
--- a/demo/grouper/grouper_daemon/container_files/tmp/initialize.gsh
+++ b/demo/grouper/grouper_daemon/container_files/tmp/initialize.gsh
@@ -7,7 +7,6 @@ addStem("", "basis", "basis")
 addStem("", "bundle", "bundle")
 addStem("", "org", "org")
 addStem("", "test", "test")
-addStem("", "midpoint", "midpoint")
 
 addRootStem("ref", "ref")
 addStem("ref", "course", "course")
@@ -26,18 +25,9 @@ attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperL
 attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapSubjectAttributeName(), "uniqueMember")
 attributeAssign.getAttributeValueDelegate().assignValue(LoaderLdapUtils.grouperLoaderLdapSubjectIdTypeName(), "subjectId")
 
-midpointGroupsGroup = new GroupSave(gs).assignName("etc:midpointGroups").assignCreateParentStemsIfNotExist(true).save()
-
-testGroup = new GroupSave(gs).assignName("midpoint:test").assignCreateParentStemsIfNotExist(true).save()
 chess = new GroupSave(gs).assignName("app:mailinglist:chess").assignCreateParentStemsIfNotExist(true).save()
 idmfans = new GroupSave(gs).assignName("app:mailinglist:idm-fans").assignCreateParentStemsIfNotExist(true).save()
 cs = new GroupSave(gs).assignName("app:cs").assignCreateParentStemsIfNotExist(true).save()
 volunteers = new GroupSave(gs).assignName("test:volunteers").assignCreateParentStemsIfNotExist(true).save()
 
-midpointGroupsGroup.addMember(SubjectFinder.findById(testGroup.getId(), 'group', 'g:gsa'), false)
-midpointGroupsGroup.addMember(SubjectFinder.findById(chess.getId(), 'group', 'g:gsa'), false)
-midpointGroupsGroup.addMember(SubjectFinder.findById(idmfans.getId(), 'group', 'g:gsa'), false)
-midpointGroupsGroup.addMember(SubjectFinder.findById(cs.getId(), 'group', 'g:gsa'), false)
-midpointGroupsGroup.addMember(SubjectFinder.findById(volunteers.getId(), 'group', 'g:gsa'), false)
-
 System.out.println("************** initialize.gsh done.")
diff --git a/demo/grouper/midpoint-objects/functionLibraries/function-library-grouper.xml b/demo/grouper/midpoint-objects/functionLibraries/function-library-grouper.xml
index 6219eb0..9ebd543 100644
--- a/demo/grouper/midpoint-objects/functionLibraries/function-library-grouper.xml
+++ b/demo/grouper/midpoint-objects/functionLibraries/function-library-grouper.xml
@@ -59,10 +59,6 @@
 			<name>message</name>
 			<type>c:AsyncUpdateMessageType</type>
 		</parameter>
-		<parameter>
-			<name>superGroup</name>
-			<type>xsd:string</type>
-		</parameter>
 		<parameter>
 			<name>groupIncludePattern</name>
 			<type>xsd:anyType</type>
diff --git a/demo/grouper/midpoint-objects/resources/resource-grouper.xml b/demo/grouper/midpoint-objects/resources/resource-grouper.xml
index eafb708..abfe97d 100644
--- a/demo/grouper/midpoint-objects/resources/resource-grouper.xml
+++ b/demo/grouper/midpoint-objects/resources/resource-grouper.xml
@@ -32,8 +32,7 @@
             <rest:baseUrl>https://grouper-ws:443</rest:baseUrl>
             <rest:username>banderson</rest:username>
             <rest:password>password</rest:password>
-            <rest:superGroup>etc:midpointGroups</rest:superGroup>
-            <rest:groupIncludePattern>midpoint:.*</rest:groupIncludePattern>
+            <rest:superGroup>etc:sysadmingroup</rest:superGroup>		<!-- parameter name will be changed -->
             <rest:groupIncludePattern>app:.*</rest:groupIncludePattern>
             <rest:groupIncludePattern>test:.*</rest:groupIncludePattern>
             <rest:groupIncludePattern>ref:.*</rest:groupIncludePattern>
@@ -69,8 +68,7 @@
                         // ------------------ START OF CONFIGURATION ------------------
 
                         parameters = [
-                            superGroup: 'etc:midpointGroups',
-                            groupIncludePattern: [ 'midpoint:.*', 'app:.*', 'test:.*', 'ref:.*' ],
+                            groupIncludePattern: [ 'app:.*', 'test:.*', 'ref:.*' ],
                             groupExcludePattern: [ '.*_(includes|excludes|systemOfRecord|systemOfRecordAndIncludes)' ],
                             relevantSourceId: 'ldap'
                         ]