Remove legacy "userGroup" group

git-svn-id: https://svn.argeo.org/commons/trunk@9366 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index cb50d4909d275aaf8ce1dd1db79dce3598a19394..b44d373633804df4ab08b2d00a85dae31aafba2a 100644 (file)
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -653,40 +653,62 @@
        <!-- ACTIVITIES -->
        <extension
                point="org.eclipse.ui.activities">
-               <!-- group admin is intended to make all user and group maintenance operations -->
-               <!--<activityPatternBinding
-                       activityId="org.argeo.cms.ui.workbench.userAdminActivity"
-                       isEqualityPattern="true"
-                       pattern="org.argeo.cms.ui.workbench.admin/org.argeo.cms.ui.workbench.admin.adminSecurityPerspective">
-               </activityPatternBinding>-->
+
+               <!-- Admin -->
                <activityPatternBinding
-                       activityId="org.argeo.cms.ui.workbench.groupAdminActivity"
-                       isEqualityPattern="true"
-                       pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminSecurityPerspective">
-               </activityPatternBinding>
-                <activityPatternBinding
                        pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.osgiPerspective"
                        isEqualityPattern="true"
                        activityId="org.argeo.cms.ui.workbench.adminActivity">
-        </activityPatternBinding>
-        <activityPatternBinding
+               </activityPatternBinding>
+               <activityPatternBinding
                        pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.jcrBrowserPerspective"
                        isEqualityPattern="true"
                        activityId="org.argeo.cms.ui.workbench.adminActivity">
                </activityPatternBinding>
+        <activityPatternBinding
+              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminMaintenancePerspective"
+              isEqualityPattern="true"
+              activityId="org.argeo.cms.ui.workbench.adminActivity">
+        </activityPatternBinding>
+        <activityPatternBinding
+              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminLogView"
+              isEqualityPattern="true"
+              activityId="org.argeo.cms.ui.workbench.adminActivity">
+        </activityPatternBinding>
                
+               <!-- UserAdmin -->
+               <activityPatternBinding
+                       activityId="org.argeo.cms.ui.workbench.userAdminActivity"
+                       isEqualityPattern="true"
+                       pattern="org.argeo.cms.ui.workbench.admin/org.argeo.cms.ui.workbench.admin.adminSecurityPerspective">
+               </activityPatternBinding>
+
+               <!-- Users -->
+        <activityPatternBinding
+              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.userHomePerspective"
+              isEqualityPattern="true"
+              activityId="org.argeo.cms.ui.workbench.userActivity">
+        </activityPatternBinding>
+        <activityPatternBinding
+              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.userProfile"
+              isEqualityPattern="true"
+              activityId="org.argeo.cms.ui.workbench.userActivity">
+        </activityPatternBinding>
+
+
+               <!-- Activity declaration -->
                <activity
-              description="Authenticated users"
-              id="org.argeo.cms.ui.workbench.userActivity"
-              name="User">
-                 <enabledWhen>
-                   <with variable="roles">
-                     <iterate ifEmpty="false" operator="or">
-                       <equals value="cn=user,ou=roles,ou=node" />
-                     </iterate>
-                   </with>
-                 </enabledWhen>
-        </activity>
+                       description="Authenticated users"
+                       id="org.argeo.cms.ui.workbench.userActivity"
+                       name="User">
+                       <enabledWhen>
+                               <with variable="roles">
+                                       <iterate ifEmpty="false" operator="or">
+                                               <equals value="cn=user,ou=roles,ou=node" />
+                                       </iterate>
+                               </with>
+                       </enabledWhen>
+               </activity>
         <activity
               description="Admins"
               id="org.argeo.cms.ui.workbench.adminActivity"
@@ -711,18 +733,6 @@
                    </with>
                  </enabledWhen>
         </activity>
-        <activity
-              description="Group Admins"
-              id="org.argeo.cms.ui.workbench.groupAdminActivity"
-              name="User Admin">
-                 <enabledWhen>
-                   <with variable="roles">
-                     <iterate ifEmpty="false" operator="or">
-                       <equals value="cn=groupAdmin,ou=roles,ou=node" />
-                     </iterate>
-                   </with>
-                 </enabledWhen>
-        </activity>
         <activity
               description="Non admins"
               id="org.argeo.cms.ui.workbench.notAdminActivity"
@@ -751,26 +761,6 @@
                        </not>
                  </enabledWhen>
         </activity>
-        <activityPatternBinding
-              activityId="org.argeo.cms.ui.workbench.adminActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminMaintenancePerspective">
-        </activityPatternBinding>
-        <activityPatternBinding
-              activityId="org.argeo.cms.ui.workbench.adminActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminLogView">
-        </activityPatternBinding>
-        <activityPatternBinding
-              activityId="org.argeo.cms.ui.workbench.userActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.userHomePerspective">
-        </activityPatternBinding>
-        <activityPatternBinding
-              activityId="org.argeo.cms.ui.workbench.userActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.userProfile">
-        </activityPatternBinding>
        </extension>
        
        <!-- STARTUP  --> 

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/ou=roles,ou=node.ldif b/org.argeo.cms/src/org/argeo/cms/internal/kernel/ou=roles,ou=node.ldif
index 7c0096c2d6a9122ea65fa70942dbdb4f384d3d5c..c50a483fd344d46930fc77306c397f6898d25799 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/ou=roles,ou=node.ldif
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/ou=roles,ou=node.ldif
@@ -20,10 +20,4 @@ objectClass: top
 cn: userAdmin
 member: cn=admin,ou=roles,ou=node
 
-dn: cn=groupAdmin,ou=roles,ou=node
-objectClass: groupOfNames
-objectClass: top
-cn: groupAdmin
-member: cn=admin,ou=roles,ou=node
-