X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fplugin.xml;h=758a9e339ea48439255d7211c7272581a4cd59db;hb=2af62c95bf8ba23905d703dcb0610bc8025d067a;hp=691e893f39460aa7151a009dffc3163728d46629;hpb=80033cfabcef26b413bf3f21ac8371bbe43ef882;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index 691e893f3..758a9e339 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -6,13 +6,13 @@
       <perspective
             id="org.argeo.cms.ui.workbench.adminSecurityPerspective"
             class="org.argeo.cms.ui.workbench.SecurityAdminPerspective"
-            icon="icons/security.gif"
+            icon="icons/group.png"
             name="Security">
       </perspective>
       <perspective
             id="org.argeo.cms.ui.workbench.userHomePerspective"
             class="org.argeo.cms.ui.workbench.UserHomePerspective"
-            icon="icons/home.gif"
+            icon="icons/home.png"
             name="Home">
       </perspective>
       <perspective
@@ -39,12 +39,17 @@
     <extension point="org.eclipse.ui.perspectiveExtensions"> 
         <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" 
@@ -65,13 +70,13 @@
 		<view
 			id="org.argeo.cms.ui.workbench.usersView"
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
-			icon="icons/users.gif"
+			icon="icons/person.png"
 			name="Users"
 			restorable="true">
 		</view>
 		<view
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
-			icon="icons/role.gif"
+			icon="icons/group.png"
 			id="org.argeo.cms.ui.workbench.groupsView"
 			name="Groups"
 			restorable="false">
@@ -80,7 +85,7 @@
 		<view
 			id="org.argeo.cms.ui.workbench.userProfile"
 			class="org.argeo.cms.ui.workbench.useradmin.UserProfile"
-			icon="icons/user.gif"
+			icon="icons/person-logged-in.png"
 			name="Profile"
 			restorable="true">
 		</view>
@@ -107,6 +112,12 @@
 			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"
@@ -120,9 +131,15 @@
 		</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> 
@@ -135,14 +152,14 @@
 			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 -->
@@ -272,9 +289,9 @@
 			name="Delete nodes">
 		</command>
 		<command
-	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.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"
@@ -292,7 +309,7 @@
 	        name="Rename Current Selected Node">
 		</command>
 		<command
-	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.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>
@@ -311,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"
@@ -352,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
@@ -381,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>
@@ -393,7 +430,7 @@
             </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>
@@ -527,10 +564,10 @@
 				</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>
@@ -653,40 +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.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
+			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"
@@ -711,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"
@@ -751,26 +798,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  -->