X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fplugin.xml;h=758a9e339ea48439255d7211c7272581a4cd59db;hb=0ec5134a2a650d98b5ca56e7dad81dd252023052;hp=2636818eb29c413c05bb1ed9bf6acb00d1df6a51;hpb=c873a0359345503b8e3ca07828bd99d525ec7cc0;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index 2636818eb..758a9e339 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -4,86 +4,179 @@
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
-            class="org.argeo.security.ui.admin.SecurityAdminPerspective"
-            icon="icons/security.gif"
             id="org.argeo.cms.ui.workbench.adminSecurityPerspective"
+            class="org.argeo.cms.ui.workbench.SecurityAdminPerspective"
+            icon="icons/group.png"
             name="Security">
       </perspective>
       <perspective
-            class="org.argeo.security.ui.UserHomePerspective"
-            icon="icons/home.gif"
             id="org.argeo.cms.ui.workbench.userHomePerspective"
+            class="org.argeo.cms.ui.workbench.UserHomePerspective"
+            icon="icons/home.png"
             name="Home">
       </perspective>
       <perspective
-            class="org.argeo.security.ui.MaintenancePerspective"
-            icon="icons/maintenance.gif"
             id="org.argeo.cms.ui.workbench.adminMaintenancePerspective"
+            class="org.argeo.cms.ui.workbench.MaintenancePerspective"
+            icon="icons/maintenance.gif"
             name="Maintenance">
       </perspective>
+      <perspective
+            id="org.argeo.cms.ui.workbench.osgiPerspective"
+            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.cms.ui.workbench.JcrBrowserPerspective"
+            name="Data Explorer"
+            icon="icons/nodes.gif">
+      </perspective>
    </extension>
    
+    <!-- Definition of the OSGI perspective -->
+    <extension point="org.eclipse.ui.perspectiveExtensions"> 
+        <perspectiveExtension targetID="org.argeo.cms.ui.workbench.osgiPerspective"> 
+            <view 
+            	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" 
+             	relative="org.argeo.cms.ui.workbench.modulesView"/> 
+             <view 
+            	id="org.argeo.cms.ui.workbench.multiplePackagesView" 
+            	minimized="false"
+             	relationship="stack" 
+             	relative="org.argeo.cms.ui.workbench.bundlesView"/> 
+        </perspectiveExtension> 
+    </extension> 
+   
+   
    <!-- VIEWS -->
    <extension
 		point="org.eclipse.ui.views">
-      <!-- Security -->
-      <view
-            class="org.argeo.eclipse.spring.SpringExtensionFactory"
-            icon="icons/users.gif"
-            id="org.argeo.cms.ui.workbench.usersView"
-            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>
-      
+		</view>
+		<!-- OSGi Monitor -->
+		<view
+      		name="Modules"
+            id="org.argeo.cms.ui.workbench.modulesView"
+            icon="icons/service_published.gif"
+			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.cms.ui.workbench.osgi.BundlesView">
+		</view>
+		<view
+      		name="Multiple Packages"
+            id="org.argeo.cms.ui.workbench.multiplePackagesView" 
+            icon="icons/node.gif"
+            class="org.argeo.cms.ui.workbench.osgi.MultiplePackagesView">
+		</view>
+		<!-- Data Explorer -->
+		<view
+          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> 
 	
 	<!-- 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 -->
+		<editor
+			name="JCR Query"
+			id="org.argeo.cms.ui.workbench.genericJcrQueryEditor"
+			icon="icons/query.png"
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			default="false">
+        </editor>
+		<editor
+			name="Node Editor"
+            id="org.argeo.cms.ui.workbench.defaultNodeEditor"
+			icon="icons/query.png"
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			default="false">
+		</editor>
 	</extension>
     
     <extension
@@ -100,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 -->
@@ -125,20 +218,143 @@
 					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>
+      	</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
+				id="param.jcrNodePath"
+				name="Node path">
+  	 		</commandParameter>
+            <!-- The path to the corresponding node if needed. -->
+            <commandParameter
+				id="param.jcrNodePath"
+				name="Node path">
+  	 		</commandParameter>
+		</command>
+    	<command
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.GetNodeSize"
+			id="org.argeo.cms.ui.workbench.getNodeSize"
+			name="Get node size">
+		</command>    
+    	<command
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+			id="org.argeo.cms.ui.workbench.addRemoteRepository"
+			name="Add remote JCR repository">
+			<!-- <commandParameter
+				id="param.repositoryUri"
+				name="Repository URI">
+  	 		</commandParameter> -->
+		</command>    
+    	<command
+			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.cms.ui.workbench.internal.jcr.commands.AddFolderNode"
+	        id="org.argeo.cms.ui.workbench.addFolderNode"
+	        name="Create a new folder">
+		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+			id="org.argeo.cms.ui.workbench.addPrivileges"
+			name="Add Privileges">
+		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+			id="org.argeo.cms.ui.workbench.removePrivileges"
+			name="Remove Privileges">
+		</command>
+		<command
+			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.cms.ui.workbench.internal.jcr.commands.Refresh"
+			id="org.argeo.cms.ui.workbench.refresh"
+			name="Refresh">
+		</command>
+		<command
+			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.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"
+	        id="org.argeo.cms.ui.workbench.openFile"
+	        name="Open current file">
+		</command> -->
+		<command
+	        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.cms.ui.workbench.internal.jcr.commands.RenameNode"
+	        id="org.argeo.cms.ui.workbench.renameNode"
+	        name="Rename Current Selected Node">
+		</command>
+		<command
+	        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.cms.ui.workbench.internal.jcr.commands.SortChildNodes"
+			id="org.argeo.cms.ui.workbench.sortChildNodes"
+			name="Sort node tree">
+            <!-- FIXME: default value does not work -->
+            <state 
+				id="org.argeo.cms.ui.workbench.sortChildNodes.toggleState" 
+				class="org.eclipse.ui.handlers.RegistryToggleState:true" >
+				<!-- <class class="org.eclipse.jface.commands.ToggleState"> 
+					<parameter
+						name="default"
+               			value="true" />
+				</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"
@@ -165,7 +381,7 @@
 							<equals value="status.active" />
 					</with>
 				</visibleWhen>
-			</command>
+			</command>			
 		</menuContribution>
     
     	<!-- UsersView specific toolbar menu -->
@@ -173,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
@@ -202,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>
@@ -214,21 +430,241 @@
             </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">
+
+        <!-- Browser view specific menu --> 
+		<menuContribution
+			locationURI="menu:org.argeo.cms.ui.workbench.jcrBrowserView">
+            <!-- See bug 149 --> 
+            <!-- <command
+            	commandId="org.argeo.cms.ui.workbench.openGenericJcrQueryEditor"
+                icon="icons/query.png"
+                style="push">
+            </command> --> 
             <command
-                  commandId="org.argeo.cms.ui.workbench.admin.refreshRoles"
-                  icon="icons/sync.gif"
-                  label="LDAP Roles Sync"
-                  tooltip="Synchronize roles from LDAP">
+            	commandId="org.argeo.cms.ui.workbench.addRemoteRepository"
+                icon="icons/addRepo.gif"
+                style="push">
             </command>
-        </menuContribution> -->
+             <command
+            	commandId="org.argeo.cms.ui.workbench.sortChildNodes"
+                icon="icons/sort.gif"
+                style="toggle"
+                label="Sort child nodes"
+                tooltip="NOTE: displaying unsorted nodes will enhance overall performances">
+            </command>
+		</menuContribution>
+		<!-- Browser view popup context menu --> 
+		<menuContribution
+			locationURI="popup:org.argeo.cms.ui.workbench.jcrBrowserView">
+			<command
+				commandId="org.argeo.cms.ui.workbench.refresh"
+				icon="icons/refresh.png"
+				style="push">
+			</command>
+			<command
+		         commandId="org.argeo.cms.ui.workbench.addFolderNode"
+		         icon="icons/addFolder.gif"
+		         label="Add Folder..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+				      <and>
+				         <or>
+				            <instanceof
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				            </instanceof>
+				            <instanceof
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
+				            </instanceof>
+				         </or>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+				      </and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+		         commandId="org.argeo.cms.ui.workbench.addPrivileges"
+		         icon="icons/addPrivileges.gif"
+		         label="Add Privileges..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+				      <and>
+				         <or>
+				            <instanceof
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				            </instanceof>
+				            <instanceof
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
+				            </instanceof>
+				         </or>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+				      </and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+		         commandId="org.argeo.cms.ui.workbench.removePrivileges"
+		         icon="icons/removePrivileges.gif"
+		         label="Remove Privileges..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+				      <and>
+				         <or>
+				            <instanceof
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				            </instanceof>
+				            <instanceof
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
+				            </instanceof>
+				         </or>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+				      </and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+		         commandId="org.argeo.cms.ui.workbench.createWorkspace"
+		         icon="icons/addWorkspace.png"
+		         label="Create Workspace..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+			      		<and>
+			         		<or>
+			            		<instanceof
+			                  		value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem">
+			            		</instanceof>
+			         		</or>
+             				<with variable="activeMenuSelection"><count value="1"/></with>
+						</and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.deleteNodes"
+				icon="icons/remove.gif"
+				label="Delete Nodes"
+				style="push">
+				<visibleWhen>
+					<iterate>
+						<or>
+							<instanceof
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+							<instanceof
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
+						</or>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.uploadFiles"
+				icon="icons/import_fs.png"
+				style="push"
+				tooltip="Upload files from the local file sytem">
+				<visibleWhen>
+					<iterate>
+						<and>
+							<or>
+								<instanceof
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+								<instanceof
+                          			value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
+                 			</or>
+                 			<with variable="activeMenuSelection"><count value="1"/></with>
+						</and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.addRemoteRepository"
+				icon="icons/addRepo.gif"
+				style="push">
+					<visibleWhen>
+						<iterate> 
+							<or>
+								<instanceof
+                    				value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoriesElem" />
+								<instanceof
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem" />
+							</or> 
+						</iterate>
+					</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.removeRemoteRepository"
+				icon="icons/remove.gif"
+				style="push">
+				<visibleWhen>
+					<iterate> 
+						<or>
+							<instanceof
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.RemoteRepositoryElem" />
+						</or> 
+           			</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.cms.ui.workbench.getNodeSize"
+				icon="icons/getSize.gif"
+				style="push">
+					<visibleWhen>
+						<iterate>
+							<or>
+								<instanceof
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+								<instanceof
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
+              				</or>
+           				</iterate>
+					</visibleWhen>
+			</command>
+			<command
+		        commandId="org.argeo.cms.ui.workbench.dumpNode"
+		        icon="icons/dumpNode.gif"
+				label="Dump Node"
+				style="push">
+				<visibleWhen>
+					<iterate> <and>
+						<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+					</and> </iterate>
+				</visibleWhen>
+			</command>
+			<command
+		        commandId="org.argeo.cms.ui.workbench.renameNode"
+		        icon="icons/rename.gif"
+				label="Rename..."
+				style="push">
+				<visibleWhen>
+					<iterate> <and>
+						<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+					</and> </iterate>
+				</visibleWhen>
+			</command>
+			<command
+		        commandId="org.argeo.cms.ui.workbench.nodeConfigurableDump"
+		        icon="icons/dumpNode.gif"
+				label="Configurable dump..."
+				style="push">
+				<visibleWhen>
+					<iterate> 
+						<and>
+							<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+             				<with variable="activeMenuSelection"><count value="1"/></with>
+						</and> 
+					</iterate>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+        
 	</extension>
 
 	<!-- SERVICES -->
@@ -243,7 +679,7 @@
 	      	</variable>
 	   	</sourceProvider>
 	   	<sourceProvider
-              provider="org.argeo.cms.ui.workbench.RolesSourceProvider">
+              provider="org.argeo.cms.ui.workbench.util.RolesSourceProvider">
            <variable
                  name="org.argeo.cms.ui.workbench.rolesVariable"
                  priorityLevel="workbench">
@@ -254,30 +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"
+
+		<!-- Admin -->
+		<activityPatternBinding
+			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.osgiPerspective"
 			isEqualityPattern="true"
-			pattern="org.argeo.cms.ui.workbench.admin/org.argeo.cms.ui.workbench.admin.adminSecurityPerspective">
-		</activityPatternBinding>-->
+			activityId="org.argeo.cms.ui.workbench.adminActivity">
+		</activityPatternBinding>
 		<activityPatternBinding
-			activityId="org.argeo.cms.ui.workbench.groupAdminActivity"
+			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.jcrBrowserPerspective"
 			isEqualityPattern="true"
-			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.adminSecurityPerspective">
+			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>
 		
-		        <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>
+		<!-- 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>
         <activity
               description="Admins"
               id="org.argeo.cms.ui.workbench.adminActivity"
@@ -302,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"
@@ -342,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>