X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fplugin.xml;h=758a9e339ea48439255d7211c7272581a4cd59db;hb=refs%2Ftags%2Fargeo-commons-2.1.70;hp=5b2ead7535cc6bdee0f442837ead1895fa346e2a;hpb=4338fa5772c552075801aa689e5c2488b85d6756;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index 5b2ead753..758a9e339 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -5,31 +5,31 @@
          point="org.eclipse.ui.perspectives">
       <perspective
             id="org.argeo.cms.ui.workbench.adminSecurityPerspective"
-            class="org.argeo.security.ui.admin.SecurityAdminPerspective"
-            icon="icons/security.gif"
+            class="org.argeo.cms.ui.workbench.SecurityAdminPerspective"
+            icon="icons/group.png"
             name="Security">
       </perspective>
       <perspective
             id="org.argeo.cms.ui.workbench.userHomePerspective"
-            class="org.argeo.security.ui.UserHomePerspective"
-            icon="icons/home.gif"
+            class="org.argeo.cms.ui.workbench.UserHomePerspective"
+            icon="icons/home.png"
             name="Home">
       </perspective>
       <perspective
             id="org.argeo.cms.ui.workbench.adminMaintenancePerspective"
-            class="org.argeo.security.ui.MaintenancePerspective"
+            class="org.argeo.cms.ui.workbench.MaintenancePerspective"
             icon="icons/maintenance.gif"
             name="Maintenance">
       </perspective>
-            <perspective
+      <perspective
             id="org.argeo.cms.ui.workbench.osgiPerspective"
-            class="org.argeo.eclipse.ui.workbench.osgi.OsgiExplorerPerspective"
+            class="org.argeo.cms.ui.workbench.OsgiExplorerPerspective"
             name="Monitoring"
             icon="icons/osgi_explorer.gif">
       </perspective>
       <perspective
             id="org.argeo.cms.ui.workbench.jcrBrowserPerspective"
-            class="org.argeo.eclipse.ui.workbench.jcr.JcrBrowserPerspective"
+            class="org.argeo.cms.ui.workbench.JcrBrowserPerspective"
             name="Data Explorer"
             icon="icons/nodes.gif">
       </perspective>
@@ -37,14 +37,19 @@
    
     <!-- Definition of the OSGI perspective -->
     <extension point="org.eclipse.ui.perspectiveExtensions"> 
-        <perspectiveExtension targetID="org.argeo.eclipse.ui.workbench.osgiPerspective"> 
+        <perspectiveExtension targetID="org.argeo.cms.ui.workbench.osgiPerspective"> 
             <view 
-            	id="org.argeo.cms.ui.workbench.modulesView" 
+            	id="org.argeo.cms.ui.workbench.cmsSessionsView" 
             	minimized="false"
              	ratio="0.5" 
              	relationship="left" 
              	relative="org.eclipse.ui.editorss"/> 
             <view 
+            	id="org.argeo.cms.ui.workbench.modulesView" 
+            	minimized="false"
+             	relationship="stack"
+             	relative="org.argeo.cms.ui.workbench.cmsSessionsView"/> 
+             <view 
             	id="org.argeo.cms.ui.workbench.bundlesView" 
             	minimized="false"
              	relationship="stack" 
@@ -61,68 +66,80 @@
    <!-- VIEWS -->
    <extension
 		point="org.eclipse.ui.views">
-      <!-- Security -->
-      <view
-            id="org.argeo.cms.ui.workbench.usersView"
-            class="org.argeo.eclipse.spring.SpringExtensionFactory"
-            icon="icons/users.gif"
-            name="Users"
-            restorable="true">
-      </view>
-      <view
-            class="org.argeo.eclipse.spring.SpringExtensionFactory"
-            icon="icons/role.gif"
-            id="org.argeo.cms.ui.workbench.groupsView"
-            name="Groups"
-            restorable="false">
-      </view>
-      <!-- Home -->
-      <view
-            id="org.argeo.cms.ui.workbench.userProfile"
-            class="org.argeo.security.ui.views.UserProfile"
-            icon="icons/user.gif"
-            name="Profile"
-            restorable="true">
-      </view>
-      <!-- Maintenance -->
-      <view
-            id="org.argeo.cms.ui.workbench.logView"
-            class="org.argeo.eclipse.spring.SpringExtensionFactory"
-            name="Log"
-            icon="icons/log.gif"
-            restorable="true">
-      </view>
-      <view
+		<!-- Security -->
+		<view
+			id="org.argeo.cms.ui.workbench.usersView"
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			icon="icons/person.png"
+			name="Users"
+			restorable="true">
+		</view>
+		<view
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			icon="icons/group.png"
+			id="org.argeo.cms.ui.workbench.groupsView"
+			name="Groups"
+			restorable="false">
+		</view>
+		<!-- Home -->
+		<view
+			id="org.argeo.cms.ui.workbench.userProfile"
+			class="org.argeo.cms.ui.workbench.useradmin.UserProfile"
+			icon="icons/person-logged-in.png"
+			name="Profile"
+			restorable="true">
+		</view>
+		<!-- Maintenance -->
+		<view
+			id="org.argeo.cms.ui.workbench.logView"
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			name="Log"
+			icon="icons/log.gif"
+			restorable="true">
+		</view>
+		<view
             id="org.argeo.cms.ui.workbench.adminLogView"
             class="org.argeo.eclipse.spring.SpringExtensionFactory"
             name="Admin Log"
             icon="icons/adminLog.gif"
             restorable="true">
-      </view>
-	  <!-- OSGi Monitor -->
-      <view
+		</view>
+		<!-- OSGi Monitor -->
+		<view
       		name="Modules"
             id="org.argeo.cms.ui.workbench.modulesView"
             icon="icons/service_published.gif"
-			class="org.argeo.eclipse.ui.workbench.osgi.ModulesView">
+			class="org.argeo.cms.ui.workbench.osgi.ModulesView">
+		</view>
+		<view
+      		name="CMS Session"
+            id="org.argeo.cms.ui.workbench.cmsSessionsView"
+            icon="icons/service_published.gif"
+			class="org.argeo.cms.ui.workbench.osgi.CmsSessionsView">
 		</view>
 		<view
       		name="Bundles"
             id="org.argeo.cms.ui.workbench.bundlesView" 
             icon="icons/bundles.gif"
-            class="org.argeo.eclipse.ui.workbench.osgi.BundlesView">
+            class="org.argeo.cms.ui.workbench.osgi.BundlesView">
 		</view>
 		<view
       		name="Multiple Packages"
             id="org.argeo.cms.ui.workbench.multiplePackagesView" 
             icon="icons/node.gif"
-            class="org.argeo.eclipse.ui.workbench.osgi.MultiplePackagesView">
+            class="org.argeo.cms.ui.workbench.osgi.MultiplePackagesView">
 		</view>
 		<!-- Data Explorer -->
 		<view
-          name="JCR Browser"
+          name="JCR"
           id="org.argeo.cms.ui.workbench.jcrBrowserView"
           icon="icons/browser.gif"
+          class="org.argeo.eclipse.spring.SpringExtensionFactory">
+	   </view>
+		<view
+          name="Files"
+          id="org.argeo.cms.ui.workbench.nodeFsBrowserView"
+          icon="icons/browser.gif"
           class="org.argeo.eclipse.spring.SpringExtensionFactory">
 	   </view>
     </extension> 
@@ -130,18 +147,19 @@
 	<!-- EDITORS -->
 	<extension
 		point="org.eclipse.ui.editors">
+		<!-- Security -->
 		<editor
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
             id="org.argeo.cms.ui.workbench.userEditor"
             name="User"
-            icon="icons/user.gif"
+            icon="icons/person.png"
             default="false">
 		</editor>
 		<editor
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
             id="org.argeo.cms.ui.workbench.groupEditor"
             name="User"
-            icon="icons/users.gif"
+            icon="icons/group.png"
             default="false">
 		</editor>
 		<!-- Data Explorer -->
@@ -159,7 +177,6 @@
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
 			default="false">
 		</editor>
-		
 	</extension>
     
     <extension
@@ -176,8 +193,8 @@
 			name="Delete User">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
-            id="org.argeo.cms.ui.workbench.userBatchUpdate"
+	        id="org.argeo.cms.ui.workbench.userBatchUpdate"
+    		defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
             name="User batch update">
 		</command>
 		<!-- Group CRUD -->
@@ -201,16 +218,15 @@
 					name="begin, commit or rollback">
  			</commandParameter>
   		</command>
-
- 	  <!-- Force the refresh when the various listener are not enough -->
-      <command
-            defaultHandler="org.argeo.security.ui.admin.internal.commands.ForceRefresh"
+		<!-- Force the refresh when the various listener are not enough -->
+		<command
+            defaultHandler="org.argeo.cms.ui.workbench.internal.useradmin.commands.ForceRefresh"
             id="org.argeo.cms.ui.workbench.forceRefresh"
             name="Force Refresh">
-      </command>
-      <!-- Data Explorer -->
-      <command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.OpenEditor"
+      	</command>
+		<!-- Data Explorer -->
+		<command
+			defaultHandler="org.argeo.cms.ui.workbench.commands.OpenEditor"
             id="org.argeo.cms.ui.workbench.openEditor"
             name="Open an editor given its ID">
             <commandParameter
@@ -224,7 +240,7 @@
   	 		</commandParameter>
 		</command>
     	<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.GetNodeSize"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.GetNodeSize"
 			id="org.argeo.cms.ui.workbench.getNodeSize"
 			name="Get node size">
 		</command>    
@@ -238,12 +254,12 @@
   	 		</commandParameter> -->
 		</command>    
     	<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.RemoveRemoteRepository"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.RemoveRemoteRepository"
 			id="org.argeo.cms.ui.workbench.removeRemoteRepository"
 			name="Remove remote JCR repository">
 		</command>    
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.AddFolderNode"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.AddFolderNode"
 	        id="org.argeo.cms.ui.workbench.addFolderNode"
 	        name="Create a new folder">
 		</command>
@@ -258,24 +274,24 @@
 			name="Remove Privileges">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.CreateWorkspace"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.CreateWorkspace"
 			id="org.argeo.cms.ui.workbench.createWorkspace"
 			name="Create a new workspace">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.Refresh"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.Refresh"
 			id="org.argeo.cms.ui.workbench.refresh"
 			name="Refresh">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.DeleteNodes"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.DeleteNodes"
 			id="org.argeo.cms.ui.workbench.deleteNodes"
 			name="Delete nodes">
 		</command>
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.ImportFileSystem"
-	        id="org.argeo.cms.ui.workbench.importFileSystem"
-	        name="Import files...">
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.UploadFiles"
+	        id="org.argeo.cms.ui.workbench.uploadFiles"
+	        name="Upload files">
 		</command>
 		<!-- <command
 	        defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
@@ -283,22 +299,22 @@
 	        name="Open current file">
 		</command> -->
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.DumpNode"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.DumpNode"
 	        id="org.argeo.cms.ui.workbench.dumpNode"
 	        name="Dump Current Selected Node">
 		</command>
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.RenameNode"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.RenameNode"
 	        id="org.argeo.cms.ui.workbench.renameNode"
 	        name="Rename Current Selected Node">
 		</command>
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.NodeConfigurableDump"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.ConfigurableNodeDump"
 	        id="org.argeo.cms.ui.workbench.nodeConfigurableDump"
 	        name="Configurable dump of the selected Node">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.SortChildNodes"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.SortChildNodes"
 			id="org.argeo.cms.ui.workbench.sortChildNodes"
 			name="Sort node tree">
             <!-- FIXME: default value does not work -->
@@ -312,13 +328,33 @@
 				</class> -->
 			</state>
 		</command>
+		<!-- Utility to provide sub menues when we don't want to define a default command for this menu -->
+		<command
+			id="org.argeo.cms.ui.workbench.doNothing"
+			defaultHandler="org.argeo.cms.ui.workbench.commands.DoNothing"
+			name="Open menu">
+		</command>    
 	</extension>
 	
 	<!-- MENU CONTRIBUTIONS -->
 	<extension
 		point="org.eclipse.ui.menus">
+    	<!-- Main tool bar menu
+    	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
+        	<toolbar id="org.argeo.cms.ui.workbench.userToolbar">
+				<command
+					commandId="org.argeo.cms.ui.workbench.rap.mainMenuCommand"
+					icon="icons/home.png"
+					id="org.argeo.cms.ui.workbench.rap.mainMenu"
+					style="pulldown">
+				</command>
+				<command commandId="org.eclipse.ui.file.save" icon="icons/save.png"/>
+				<command commandId="org.eclipse.ui.file.saveAll" icon="icons/save-all.png"/>
+			</toolbar>
+		</menuContribution>
+		-->
 		<menuContribution
-			locationURI="toolbar:org.argeo.cms.ui.workbench.rap.userToolbar?after=org.eclipse.ui.file.saveAll"> 
+			locationURI="toolbar:org.argeo.cms.ui.workbench.userToolbar?after=org.eclipse.ui.file.saveAll"> 
 			<!-- Transaction management --> 
  			<command
 				commandId="org.argeo.cms.ui.workbench.userTransactionHandler"
@@ -353,20 +389,20 @@
             locationURI="toolbar:org.argeo.cms.ui.workbench.usersView">
             <command
                   commandId="org.argeo.cms.ui.workbench.deleteUsers"
-                  icon="icons/remove.gif"
-                  label="Delete User"
+                  icon="icons/delete.png"
+                  label="Delete"
                   tooltip="Delete selected users">
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.forceRefresh"
                   icon="icons/refresh.png"
-                  label="Refresh list"
+                  label="Refresh"
                   tooltip="Force the full refresh of the user list">
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.newUser"
-                  icon="icons/add.gif"
-                  label="Add User"
+                  icon="icons/add.png"
+                  label="Add"
                   tooltip="Create a new user">
             </command>
             <command
@@ -382,7 +418,7 @@
             locationURI="toolbar:org.argeo.cms.ui.workbench.groupsView">
             <command
                   commandId="org.argeo.cms.ui.workbench.deleteGroups"
-                  icon="icons/remove.gif"
+                  icon="icons/delete.png"
                   label="Delete Group"
                   tooltip="Delete selected groups">
             </command>
@@ -394,21 +430,12 @@
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.newGroup"
-                  icon="icons/add.gif"
+                  icon="icons/add.png"
                   label="Add Group"
                   tooltip="Create a new group">
             </command>
         </menuContribution>
-         
-		<!--      	<menuContribution
-            locationURI="toolbar:org.argeo.cms.ui.workbench.admin.adminRolesView">
-            <command
-                  commandId="org.argeo.cms.ui.workbench.admin.refreshRoles"
-                  icon="icons/sync.gif"
-                  label="LDAP Roles Sync"
-                  tooltip="Synchronize roles from LDAP">
-            </command>
-        </menuContribution> -->
+
         <!-- Browser view specific menu --> 
 		<menuContribution
 			locationURI="menu:org.argeo.cms.ui.workbench.jcrBrowserView">
@@ -449,10 +476,10 @@
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -470,10 +497,10 @@
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -491,10 +518,10 @@
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -512,7 +539,7 @@
 			      		<and>
 			         		<or>
 			            		<instanceof
-			                  		value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem">
+			                  		value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem">
 			            		</instanceof>
 			         		</or>
              				<with variable="activeMenuSelection"><count value="1"/></with>
@@ -529,26 +556,26 @@
 					<iterate>
 						<or>
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
 						</or>
 					</iterate>
 				</visibleWhen>
 			</command>
 			<command
-				commandId="org.argeo.cms.ui.workbench.importFileSystem"
+				commandId="org.argeo.cms.ui.workbench.uploadFiles"
 				icon="icons/import_fs.png"
 				style="push"
-				tooltip="Import files from the files sytem">
+				tooltip="Upload files from the local file sytem">
 				<visibleWhen>
 					<iterate>
 						<and>
 							<or>
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 								<instanceof
-                          			value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+                          			value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
                  			</or>
                  			<with variable="activeMenuSelection"><count value="1"/></with>
 						</and>
@@ -563,9 +590,9 @@
 						<iterate> 
 							<or>
 								<instanceof
-                    				value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem" />
+                    				value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoriesElem" />
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem" />
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem" />
 							</or> 
 						</iterate>
 					</visibleWhen>
@@ -578,7 +605,7 @@
 					<iterate> 
 						<or>
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem" />
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.RemoteRepositoryElem" />
 						</or> 
            			</iterate>
 				</visibleWhen>
@@ -591,9 +618,9 @@
 						<iterate>
 							<or>
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
               				</or>
            				</iterate>
 					</visibleWhen>
@@ -605,7 +632,7 @@
 				style="push">
 				<visibleWhen>
 					<iterate> <and>
-						<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+						<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              			<with variable="activeMenuSelection"><count value="1"/></with>
 					</and> </iterate>
 				</visibleWhen>
@@ -617,7 +644,7 @@
 				style="push">
 				<visibleWhen>
 					<iterate> <and>
-						<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+						<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              			<with variable="activeMenuSelection"><count value="1"/></with>
 					</and> </iterate>
 				</visibleWhen>
@@ -630,7 +657,7 @@
 				<visibleWhen>
 					<iterate> 
 						<and>
-							<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+							<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              				<with variable="activeMenuSelection"><count value="1"/></with>
 						</and> 
 					</iterate>
@@ -652,7 +679,7 @@
 	      	</variable>
 	   	</sourceProvider>
 	   	<sourceProvider
-              provider="org.argeo.security.ui.RolesSourceProvider">
+              provider="org.argeo.cms.ui.workbench.util.RolesSourceProvider">
            <variable
                  name="org.argeo.cms.ui.workbench.rolesVariable"
                  priorityLevel="workbench">
@@ -663,41 +690,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.security.ui.adminActivity">
-			<!-- activityId="org.argeo.security.ui.adminActivity" -->
-        </activityPatternBinding>
-        <activityPatternBinding
+			activityId="org.argeo.cms.ui.workbench.adminActivity">
+		</activityPatternBinding>
+		<activityPatternBinding
 			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.jcrBrowserPerspective"
 			isEqualityPattern="true"
-			activityId="org.argeo.security.ui.adminActivity">
+			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
+			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminSecurityPerspective"
+			activityId="org.argeo.cms.ui.workbench.userAdminActivity"
+			isEqualityPattern="true">
+		</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"
@@ -722,18 +770,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"
@@ -762,31 +798,10 @@
 		  	</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  --> 
 	<extension point="org.eclipse.ui.startup">
-   		<startup class="org.argeo.security.ui.admin.internal.PartStateChanged"/>
+   		<startup class="org.argeo.cms.ui.workbench.internal.useradmin.PartStateChanged"/>
 	</extension>
-</plugin>
\ No newline at end of file
+</plugin>