X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fplugin.xml;h=79c7950e06712f6e584fb3eaeff8734a0b6014de;hb=460cb0f2be7a8fa92ee6f22564b42a25aac5de4b;hp=62c94737a96099c01e0efedb124b5664a711c126;hpb=5cb35232a52faf436d3a382c17b0bf2aa75560f0;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/plugin.xml b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
index 62c94737a..79c7950e0 100644
--- a/plugins/org.argeo.slc.client.ui.dist/plugin.xml
+++ b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
@@ -4,22 +4,40 @@
  	<!-- Perspectives --> 
    <extension
          point="org.eclipse.ui.perspectives">
-      <perspective
+		<perspective
             name="SLC Repo"
             class="org.argeo.slc.client.ui.dist.DistributionPerspective"
             id="org.argeo.slc.client.ui.dist.distributionPerspective"
             icon="icons/distribution_perspective.gif">
-      </perspective>
-      <perspective
+		</perspective>
+		<perspective
             name="SLC Distribution"
             class="org.argeo.slc.client.ui.dist.AnonymousDistributionPerspective"
             id="org.argeo.slc.client.ui.dist.anonymousDistributionPerspective"
-            icon="icons/distribution_perspective.gif">
-      </perspective>
+            icon="icons/repo.gif">
+		</perspective>
    </extension>
    <!-- Views -->
    <extension
          point="org.eclipse.ui.views">
+      <view
+            class="org.argeo.eclipse.spring.SpringExtensionFactory"
+            id="org.argeo.slc.client.ui.dist.distributionsView"
+            icon="icons/search.gif"
+            name="Distributions">
+      </view>
+      <view
+            class="org.argeo.eclipse.spring.SpringExtensionFactory"
+            id="org.argeo.slc.client.ui.dist.anonymousDistributionsView"
+            icon="icons/search.gif"
+            name="Public Repository">
+      </view>
+      <view
+            class="org.argeo.slc.client.ui.dist.views.HelpView"
+            id="org.argeo.slc.client.ui.dist.helpView"
+            icon="icons/help.gif"
+            name="About">
+      </view>
       <view
             class="org.argeo.eclipse.spring.SpringExtensionFactory"
             id="org.argeo.slc.client.ui.dist.artifactsBrowser"
@@ -44,13 +62,7 @@
             icon="icons/search.gif"
             name="Query builder">
       </view>
-      <view
-            class="org.argeo.eclipse.spring.SpringExtensionFactory"
-            id="org.argeo.slc.client.ui.dist.distributionsView"
-            icon="icons/search.gif"
-            name="Distributions">
-      </view>
-	   <view
+       <view
 	         name="Progress View"
 	         icon="icons/pview.gif"
 	         category="org.eclipse.ui"
@@ -79,7 +91,7 @@
     <!-- Commands --> 
    	<extension
          point="org.eclipse.ui.commands">
-		<!-- Command which do not need dependency injection -->
+		<!-- Commands that do not need dependency injection -->
 		<command
             defaultHandler="org.argeo.slc.client.ui.dist.commands.RefreshArtifactBrowser"
             id="org.argeo.slc.client.ui.dist.refreshArtifactBrowser"
@@ -89,35 +101,8 @@
             defaultHandler="org.argeo.slc.client.ui.dist.commands.DisplayRepoInformation"
             id="org.argeo.slc.client.ui.dist.displayRepoInformation"
             name="Display repo info">
-    	</command>
-		<!-- Workspaces CRUD --> 
-    	<command
-            defaultHandler="org.argeo.slc.client.ui.dist.commands.PublishWorkspace"
-            id="org.argeo.slc.client.ui.dist.publishWorkspace"
-            name="Publish selected workspace">
     	</command>
 		<command
-            id="org.argeo.slc.client.ui.dist.createWorkspace"
-            defaultHandler="org.argeo.slc.client.ui.dist.commands.CreateWorkspace"
-            name="Create Workspace">
-    	</command>
-    	<command
-            id="org.argeo.slc.client.ui.dist.deleteWorkspace"
-            defaultHandler="org.argeo.slc.client.ui.dist.commands.DeleteWorkspace"
-            name="Delete chosen Workspace">
-    	</command>
-    	<command
-            id="org.argeo.slc.client.ui.dist.normalizeDistribution"
-            defaultHandler="org.argeo.slc.client.ui.dist.commands.NormalizeDistribution"
-            name="Normalize Distribution">
-    	</command>
-		<command
-            id="org.argeo.slc.client.ui.dist.copyWorkspace"
-            defaultHandler="org.argeo.slc.client.ui.dist.commands.CopyWorkspace"
-            name="Copy chosen Workspace">
-    	</command>
-    	
-    	<command
             defaultHandler="org.argeo.slc.client.ui.dist.commands.ShowSizeColumn"
             id="org.argeo.slc.client.ui.dist.showSizeColumn"
             name="Show size column">
@@ -131,8 +116,6 @@
 			</state>
     	</command>
 
-
-
 		<!-- Command with Spring dependency injection -->
 		<command
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
@@ -164,11 +147,113 @@
             name="Fetch repository">
             <commandParameter
          		id="targetRepoPath"
-         		name="Target repo path">
+         		name="Target repo uri">
   	 		</commandParameter>
     	</command>
 	
 		<!-- TO MANIPULATE WORKSPACES -->
+		<!-- Workspaces CRUD --> 
+		<command
+            id="org.argeo.slc.client.ui.dist.createWorkspace"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Create Workspace">
+            <commandParameter
+         		id="workspacePrefix"
+         		name="Workspace prefix">
+  	 		</commandParameter>
+            <commandParameter
+         		id="targetRepoPath"
+         		name="Target repo node path">
+  	 		</commandParameter>
+    	</command>
+		<command
+			id="org.argeo.slc.client.ui.dist.deleteWorkspace"
+			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+			name="Delete chosen Workspace">
+			<commandParameter
+				id="workspaceName"
+				name="Workspace name">
+			</commandParameter>
+			<commandParameter
+				id="targetRepoPath"
+				name="Target repo node path">
+			</commandParameter>
+    	</command>
+    	<command
+            id="org.argeo.slc.client.ui.dist.publishWorkspace"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Publish selected workspace">
+			<commandParameter
+				id="workspaceName"
+				name="Workspace name">
+			</commandParameter>
+			<commandParameter
+				id="targetRepoPath"
+				name="Target repo node path">
+			</commandParameter>
+    	</command>
+    	<command
+            id="org.argeo.slc.client.ui.dist.normalizeDistribution"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Normalize Distribution">
+			<commandParameter
+				id="workspaceName"
+				name="Workspace name">
+			</commandParameter>
+			<commandParameter
+				id="targetRepoPath"
+				name="Target repo node path">
+			</commandParameter>
+    	</command>
+    	
+    	<command
+            id="org.argeo.slc.client.ui.dist.normalizeWorkspace"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Normalize Workspace">
+			<commandParameter
+				id="workspaceName"
+				name="Workspace name">
+			</commandParameter>
+			<commandParameter
+				id="targetRepoPath"
+				name="Target repo node path">
+			</commandParameter>
+    	</command>
+    	
+		<command
+            id="org.argeo.slc.client.ui.dist.copyWorkspace"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Copy chosen Workspace">
+            <commandParameter
+         		id="srcWkspName"
+         		name="Source Workspace Name">
+  	 		</commandParameter>
+            <commandParameter
+         		id="targetRepoPath"
+         		name="Target repo node path">
+  	 		</commandParameter>
+    	</command>
+    	<command
+            id="org.argeo.slc.client.ui.dist.mergeWorkspaces"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Copy chosen Workspace">
+            <commandParameter
+         		id="srcWkspName"
+         		name="Source Workspace Name">
+  	 		</commandParameter>
+          <commandParameter
+         		id="srcRepoPath"
+         		name="Source Repo Node path ">
+  	 		</commandParameter>
+           <commandParameter
+         		id="targetWkspName"
+         		name="Target Workspace Name">
+  	 		</commandParameter>
+            <commandParameter
+         		id="targetRepoPath"
+         		name="Target repo node path">
+  	 		</commandParameter>
+    	</command>
     	<command
             id="org.argeo.slc.client.ui.dist.manageWorkspaceAuth"
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
@@ -238,6 +323,15 @@
             </command>
             -->
         </menuContribution>
+        <menuContribution
+        	locationURI="toolbar:org.argeo.slc.client.ui.dist.anonymousDistributionsView">
+            <command
+            	commandId="org.argeo.slc.client.ui.dist.refreshDistributionsView"
+                icon="icons/refresh.png"
+                label="Refresh"
+                tooltip="Refresh distributions view">
+            </command>
+        </menuContribution>
         <!-- Queries --> 
 		<!-- <menuContribution
                 allPopups="false"