X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fplugin.xml;h=97637957699dde5dd421260980c348ab8fac6f8b;hb=1e6cf7254fb9f150251594cf0383b3b1c5210517;hp=21337e840555afe7f4bc7c53f38ad87388d65b25;hpb=706b98df2c68382d7bd501fa05cb128f329087ee;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 21337e840..976379576 100644
--- a/plugins/org.argeo.slc.client.ui.dist/plugin.xml
+++ b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
@@ -5,7 +5,7 @@
 	<extension
 		point="org.eclipse.ui.perspectives">
 		<perspective
-            name="SLC Repo"
+            name="SLC Factory"
             class="org.argeo.slc.client.ui.dist.DistributionPerspective"
             id="org.argeo.slc.client.ui.dist.distributionPerspective"
             icon="icons/distribution_perspective.gif">
@@ -81,15 +81,22 @@
 			default="false">
 		</editor>
 		<editor
-			class="org.argeo.slc.client.ui.dist.editors.DistributionEditor"
-			id="org.argeo.slc.client.ui.dist.distributionEditor"
-			name="Distribution editor"
-			icon="icons/distribution_perspective.gif"
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			id="org.argeo.slc.client.ui.dist.artifactVersionEditor"
+			name="Artifact Version Editor"
+			icon="icons/artifactVersionBase.gif"
+			default="false">
+		</editor>
+		<editor
+			class="org.argeo.eclipse.spring.SpringExtensionFactory"
+			id="org.argeo.slc.client.ui.dist.modularDistVersionEditor"
+			name="Modular Distribution Version Editor"
+			icon="icons/modularDistributionVersion.gif"
 			default="false">
 		</editor>
 		<editor
 			class="org.argeo.eclipse.spring.SpringExtensionFactory"
-			id="org.argeo.slc.client.ui.dist.distributionWorkspaceEditor"
+			id="org.argeo.slc.client.ui.dist.distWorkspaceEditor"
 			name="Distribution workspace editor"
 			icon="icons/distribution_perspective.gif"
 			default="false">
@@ -115,6 +122,28 @@
 			</commandParameter>
     	</command>
     	
+    	<command
+            id="org.argeo.slc.client.ui.dist.openModuleEditor"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Open Workspace Editor">
+			<commandParameter
+				id="param.repoNodePath"
+				name="Repo node path">
+			</commandParameter>
+			<commandParameter
+				id="param.repoUri"
+				name="Repo URI">
+			</commandParameter>
+			<commandParameter
+				id="param.workspaceName"
+				name="Workspace name">
+			</commandParameter>
+			<commandParameter
+				id="param.modulePath"
+				name="Module path name">
+			</commandParameter>
+    	</command>
+    	
     	<!-- Repository Management --> 
     	<command
             id="org.argeo.slc.client.ui.dist.registerRepository"
@@ -163,6 +192,31 @@
          		name="Target repo uri">
   	 		</commandParameter>
     	</command>
+    	
+    	<!-- <command
+            defaultHandler="org.argeo.slc.client.ui.dist.commands.MarkAsRelevantCategory"
+            id="org.argeo.slc.client.ui.dist.markAsRelevantCategory"
+            name="Mark as relevant category">
+    	</command> --> 
+    	
+    	<command
+            id="org.argeo.slc.client.ui.dist.openGenerateBinariesWizard"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Generate Binaries...">
+            <commandParameter
+				id="param.repoNodePath"
+				name="Repo node path">
+			</commandParameter>
+			<commandParameter
+				id="param.workspaceName"
+				name="Workspace name">
+			</commandParameter>
+			<commandParameter
+				id="param.modulePath"
+				name="Module path name">
+			</commandParameter>
+    	</command>
+    	
     	<command
             id="org.argeo.slc.client.ui.dist.normalizeWorkspace"
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
@@ -200,7 +254,30 @@
 			</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>
+    	
     	<!-- Workspaces CRUD --> 
+		<!-- Generic new and copy workspace -->
 		<command
             id="org.argeo.slc.client.ui.dist.createWorkspace"
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
@@ -213,8 +290,42 @@
          		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>
+    	<!-- Specific for local java workspaces --> 
+    	<command
+            id="org.argeo.slc.client.ui.dist.createLocalJavaWorkspace"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Create Local Java Workspace">
+            <commandParameter
+         		id="workspacePrefix"
+         		name="Workspace prefix">
+  	 		</commandParameter>
     	</command>
 		<command
+            id="org.argeo.slc.client.ui.dist.copyLocalJavaWorkspace"
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            name="Copy chosen local Java Workspace">
+            <commandParameter
+         		id="srcWkspName"
+         		name="Source Workspace Name">
+  	 		</commandParameter>
+    	</command>
+		
+		<!-- Not terminated delete command - does not really work -->
+    	<command
 			id="org.argeo.slc.client.ui.dist.deleteWorkspace"
 			defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
 			name="Delete chosen Workspace">
@@ -228,48 +339,34 @@
 			</commandParameter>
     	</command>
     	
+ 		<!-- Advanced commands --> 
 		<command
-            id="org.argeo.slc.client.ui.dist.copyWorkspace"
+            id="org.argeo.slc.client.ui.dist.doNothing"
+            defaultHandler="org.argeo.slc.client.ui.dist.commands.DoNothing"
+            name="Advanced">
+    	</command>
+		<command
+            id="org.argeo.slc.client.ui.dist.runInOsgi"
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
-            name="Copy chosen Workspace">
-            <commandParameter
-         		id="srcWkspName"
-         		name="Source Workspace Name">
-  	 		</commandParameter>
+            name="Run in OSGi">
             <commandParameter
-         		id="targetRepoPath"
-         		name="Target repo node path">
+         		id="workspaceName"
+         		name="Workspace Name">
   	 		</commandParameter>
     	</command>
-    	
     	<command
-            id="org.argeo.slc.client.ui.dist.mergeWorkspaces"
+            id="org.argeo.slc.client.ui.dist.refreshDistributionsView"
             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>
+            name="Refresh Distributions View">
     	</command>
-    	
+		
 		<!-- Legacy -->
 		<command
             defaultHandler="org.argeo.slc.client.ui.dist.commands.RefreshArtifactBrowser"
             id="org.argeo.slc.client.ui.dist.refreshArtifactBrowser"
             name="Refresh Artifact Browser">
     	</command>
+    	    	
     	<command
             defaultHandler="org.argeo.slc.client.ui.dist.commands.ShowSizeColumn"
             id="org.argeo.slc.client.ui.dist.showSizeColumn"
@@ -283,56 +380,23 @@
 				</class>
 			</state>
     	</command>
-
-		<command
-            id="org.argeo.slc.client.ui.dist.runInOSGi"
-            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
-            name="Run in OSGi">
-            <commandParameter
-         		id="workspace"
-         		name="Workspace Name">
-  	 		</commandParameter>
-    	</command>
-		
-    	<command
-            id="org.argeo.slc.client.ui.dist.refreshDistributionsView"
-            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
-            name="Refresh Distributions View">
-    	</command>
-
     	<command
             id="org.argeo.slc.client.ui.dist.refreshDistributionOverviewPage"
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
             name="Refresh distribution overview page">
     	</command>
-
     	<command
             id="org.argeo.slc.client.ui.dist.deleteArtifacts"
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
             name="Remove selected artifacts">
     	</command>
     </extension>
+    
+	<!-- MENU CONTRIBUTIONS --> 
 	<extension
          id="menu:org.eclipse.ui.main.menu"
          point="org.eclipse.ui.menus">
-    
-         <!-- View Specific Menus --> 
-		<menuContribution
-        	locationURI="toolbar:org.argeo.slc.client.ui.dist.artifactsBrowser">
-            <command
-            	commandId="org.argeo.slc.client.ui.dist.showSizeColumn"
-                icon="icons/showSize.gif"
-                style="toggle" 
-                label="Show sizes"
-                tooltip="Warning: showing size column might reduce overall browser reactivity">
-            </command>
-			<command
-            	commandId="org.argeo.slc.client.ui.dist.refreshArtifactBrowser"
-                icon="icons/refresh.png"
-	                label="Refresh"
-                tooltip="Refresh the whole browser">
-            </command>
-        </menuContribution>
+		<!-- Distributions view tool bar --> 
 		<menuContribution
         	locationURI="toolbar:org.argeo.slc.client.ui.dist.distributionsView">
             <command
@@ -341,28 +405,54 @@
                 label="Register repository"
                 tooltip="Register a remote repository">
             </command>
-            <command
-            	commandId="org.argeo.slc.client.ui.dist.refreshDistributionsView"
-                icon="icons/refresh.png"
-                label="Refresh"
-                tooltip="Refresh distributions view">
-            </command>
-           <!--
-            <command
+             <command
+             	 commandId="org.argeo.slc.client.ui.dist.doNothing"
+                 id="org.argeo.slc.client.ui.dist.advancedMenu"
+                 icon="icons/more.gif"
+                 tooltip="Access to advanced commands"
+                 style="pulldown">
+           </command>
+        </menuContribution>
+		<menuContribution locationURI="menu:org.argeo.slc.client.ui.dist.advancedMenu">
+        	<command
+				commandId="org.argeo.slc.client.ui.dist.refreshDistributionsView"
+				icon="icons/refresh.png"
+				label="Refresh"
+				tooltip="Force the full refresh of the distribution tree (close all open connections)">
+			</command>
+            <!-- <command
             	commandId="org.argeo.slc.client.ui.dist.runInOSGi"
                 icon="icons/showSize.gif"
                 label="Run in OSGi"
                 tooltip="Run in a spearate OSGi runtime">
             </command>
             -->
-        </menuContribution>
+		</menuContribution>
+		<!-- Anonymous distribution view toolbar -->             
         <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">
+                tooltip="Force the full refresh of the distribution tree (close all open connections)">
+            </command>
+        </menuContribution>
+        <!-- Artifact Browser Tool bar --> 
+		<menuContribution
+        	locationURI="toolbar:org.argeo.slc.client.ui.dist.artifactsBrowser">
+            <command
+            	commandId="org.argeo.slc.client.ui.dist.showSizeColumn"
+                icon="icons/showSize.gif"
+                style="toggle" 
+                label="Show sizes"
+                tooltip="Warning: showing size column might reduce overall browser reactivity">
+            </command>
+			<command
+            	commandId="org.argeo.slc.client.ui.dist.refreshArtifactBrowser"
+                icon="icons/refresh.png"
+	                label="Refresh"
+                tooltip="Refresh the whole browser">
             </command>
         </menuContribution>
         <!-- Queries --> 
@@ -383,7 +473,7 @@
              </menu>
           </menuContribution> -->
 	</extension>
-  <extension
+	<extension
            point="org.eclipse.ui.activities">
         <!-- TODO: find a way to exclude evrything -->
         <activityPatternBinding