X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui.workbench%2Fplugin.xml;h=215f1203d559cc2a11e685cb7b87085fbde1846c;hb=5c7836956672a7fb5aa97d6fdfad494d91c643eb;hp=5e281b29a3ed22b75e3a285594fa73e1a4a2bcfc;hpb=0947eeab5f5224be47a038e23ba5ae68b760d048;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui.workbench/plugin.xml b/org.argeo.eclipse.ui.workbench/plugin.xml
index 5e281b29a..215f1203d 100644
--- a/org.argeo.eclipse.ui.workbench/plugin.xml
+++ b/org.argeo.eclipse.ui.workbench/plugin.xml
@@ -130,10 +130,15 @@
 	        name="Create a new folder">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.AddPrivileges"
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
 			id="org.argeo.eclipse.ui.workbench.addPrivileges"
 			name="Add Privileges">
 		</command>
+		<command
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+			id="org.argeo.eclipse.ui.workbench.removePrivileges"
+			name="Remove Privileges">
+		</command>
 		<command
 			defaultHandler="org.argeo.eclipse.ui.workbench.commands.CreateWorkspace"
 			id="org.argeo.eclipse.ui.workbench.createWorkspace"
@@ -226,17 +231,17 @@
 			<command
 		         commandId="org.argeo.eclipse.ui.workbench.addFolderNode"
 		         icon="icons/addFolder.gif"
-		         label="Add Folder"
+		         label="Add Folder..."
 		         style="push">
 				<visibleWhen>
 					<iterate>
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem">
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem">
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -246,18 +251,39 @@
 			</command>
 			<command
 		         commandId="org.argeo.eclipse.ui.workbench.addPrivileges"
-		         icon="icons/addPrivileges.png"
-		         label="Add Privileges"
+		         icon="icons/addPrivileges.gif"
+		         label="Add Privileges..."
+		         style="push">
+				<visibleWhen>
+					<iterate>
+				      <and>
+				         <or>
+				            <instanceof
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				            </instanceof>
+				            <instanceof
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				            </instanceof>
+				         </or>
+             			<with variable="activeMenuSelection"><count value="1"/></with>
+				      </and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+		         commandId="org.argeo.eclipse.ui.workbench.removePrivileges"
+		         icon="icons/removePrivileges.gif"
+		         label="Remove Privileges..."
 		         style="push">
 				<visibleWhen>
 					<iterate>
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem">
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem">
+				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -268,14 +294,14 @@
 			<command
 		         commandId="org.argeo.eclipse.ui.workbench.createWorkspace"
 		         icon="icons/addWorkspace.png"
-		         label="Create Workspace"
+		         label="Create Workspace..."
 		         style="push">
 				<visibleWhen>
 					<iterate>
 			      		<and>
 			         		<or>
 			            		<instanceof
-			                  		value="org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoryElem">
+			                  		value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem">
 			            		</instanceof>
 			         		</or>
              				<with variable="activeMenuSelection"><count value="1"/></with>
@@ -292,9 +318,9 @@
 					<iterate>
 						<or>
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem" />
+								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem" />
+								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
 						</or>
 					</iterate>
 				</visibleWhen>
@@ -309,9 +335,9 @@
 						<and>
 							<or>
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem" />
+									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 								<instanceof
-                          			value="org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem" />
+                          			value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
                  			</or>
                  			<with variable="activeMenuSelection"><count value="1"/></with>
 						</and>
@@ -326,9 +352,9 @@
 						<iterate> 
 							<or>
 								<instanceof
-                    				value="org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoriesElem" />
+                    				value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem" />
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.jcr.internal.model.RepositoryElem" />
+									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem" />
 							</or> 
 						</iterate>
 					</visibleWhen>
@@ -341,7 +367,7 @@
 					<iterate> 
 						<or>
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.jcr.internal.model.RemoteRepositoryElem" />
+								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem" />
 						</or> 
            			</iterate>
 				</visibleWhen>
@@ -354,9 +380,9 @@
 						<iterate>
 							<or>
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem" />
+									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.jcr.internal.model.WorkspaceElem" />
+									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
               				</or>
            				</iterate>
 					</visibleWhen>
@@ -368,7 +394,7 @@
 				style="push">
 				<visibleWhen>
 					<iterate> <and>
-						<instanceof value="org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem"></instanceof>
+						<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              			<with variable="activeMenuSelection"><count value="1"/></with>
 					</and> </iterate>
 				</visibleWhen>
@@ -380,7 +406,7 @@
 				style="push">
 				<visibleWhen>
 					<iterate> <and>
-						<instanceof value="org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem"></instanceof>
+						<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              			<with variable="activeMenuSelection"><count value="1"/></with>
 					</and> </iterate>
 				</visibleWhen>
@@ -393,7 +419,7 @@
 				<visibleWhen>
 					<iterate> 
 						<and>
-							<instanceof value="org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem"></instanceof>
+							<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              				<with variable="activeMenuSelection"><count value="1"/></with>
 						</and> 
 					</iterate>
@@ -405,6 +431,7 @@
 	<!-- Reduce visibility of JCR Browser perspective to users that are in ROLE_ADMIN --> 	
 	<extension
     	point="org.eclipse.ui.activities">
+    	<!--
 		<activity
 			description="Only for admins"
 			id="org.argeo.eclipse.ui.workbench.adminActivity"
@@ -417,16 +444,17 @@
 				</with>
 			</enabledWhen>
 		</activity>
+		-->
         <activityPatternBinding
 			pattern="org.argeo.eclipse.ui.workbench/org.argeo.eclipse.ui.workbench.osgiPerspective"
 			isEqualityPattern="true"
-			activityId="org.argeo.eclipse.ui.workbench.adminActivity">
+			activityId="org.argeo.security.ui.adminActivity">
 			<!-- activityId="org.argeo.security.ui.adminActivity" -->
         </activityPatternBinding>
         <activityPatternBinding
 			pattern="org.argeo.eclipse.ui.workbench/org.argeo.eclipse.ui.workbench.jcrBrowserPerspective"
 			isEqualityPattern="true"
-			activityId="org.argeo.eclipse.ui.workbench.adminActivity">
+			activityId="org.argeo.security.ui.adminActivity">
 		</activityPatternBinding>
 	</extension>
 </plugin>
\ No newline at end of file