X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui.workbench%2Fplugin.xml;h=d89ce60b011318aaf28ec44e0f0cc55c90dc8ce5;hb=refs%2Ftags%2Fargeo-commons-2.1.59;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..d89ce60b0 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -120,9 +120,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> 
@@ -272,9 +278,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 +298,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>
@@ -527,10 +533,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 +659,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 +739,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 +767,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  -->