X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2FMETA-INF%2Fspring%2Fcommands.xml;h=c8ec38b376af7718428478d69ecc3ce79b00e39e;hb=7ac8a536076af44569a23d9d67bb443cdc06018b;hp=da185e6dfcf44f827320649079518b2ab446fcd3;hpb=bd06b3358f8c754765fcb222ac3b2273d0d56c37;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml b/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
index da185e6df..c8ec38b37 100644
--- a/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
+++ b/plugins/org.argeo.slc.client.ui.dist/META-INF/spring/commands.xml
@@ -4,70 +4,144 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<bean id="org.argeo.slc.client.ui.dist.openGenericJcrQueryEditor"
-		class="org.argeo.eclipse.ui.jcr.commands.OpenGenericJcrQueryEditor"
+	<!-- DISTRIBUTIONS MANAGEMENT -->
+	<bean id="normalizeDistribution"
+		class="org.argeo.slc.client.ui.dist.commands.NormalizeDistribution">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="keyring" ref="keyring" />
+		<property name="nodeRepository" ref="nodeRepository" />
+	</bean>
+
+	<bean id="openModuleEditor" class="org.argeo.slc.client.ui.dist.commands.OpenModuleEditor"
 		scope="prototype">
-		<property name="editorId"
-			value="org.argeo.slc.client.ui.dist.genericJcrQueryEditor" />
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="keyring" ref="keyring" />
+		<property name="localRepository" ref="nodeRepository" />
 	</bean>
 
-	<bean id="runInOSGi" class="org.argeo.slc.client.ui.dist.commands.RunInOsgi"
+	<!-- REPOSITORY MANAGEMENT -->
+	<bean id="registerRepository"
+		class="org.argeo.slc.client.ui.dist.commands.RegisterRepository">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+	<bean id="unregisterRemoteRepo"
+		class="org.argeo.slc.client.ui.dist.commands.UnregisterRemoteRepo"
 		scope="prototype">
-		<property name="repository" ref="javaRepository" />
-		<property name="workspace" value="org.argeo.tp-1.3.1" />
+		<property name="nodeRepository" ref="nodeRepository" />
 	</bean>
 
-	<bean id="normalizeDistribution"
-		class="org.argeo.slc.client.ui.dist.commands.NormalizeDistribution"
+	<bean id="displayRepoInformation"
+		class="org.argeo.slc.client.ui.dist.commands.DisplayRepoInformation"
 		scope="prototype">
-		<property name="repository" ref="javaRepository" />
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="keyring" ref="keyring" />
 	</bean>
-	<bean id="createWorkspace" class="org.argeo.slc.client.ui.dist.commands.CreateWorkspace"
+
+
+	<!-- WORKSPACE MANAGEMENT -->
+	<bean id="openWorkspaceEditor"
+		class="org.argeo.slc.client.ui.dist.commands.OpenWorkspaceEditor"
 		scope="prototype">
-		<property name="repository" ref="javaRepository" />
+		<property name="localRepository" ref="nodeRepository" />
 	</bean>
+
 	<bean id="fetch" class="org.argeo.slc.client.ui.dist.commands.Fetch"
 		scope="prototype">
 		<property name="repositoryFactory" ref="repositoryFactory" />
-		<property name="nodeRepository" ref="nodeRepository" />
 		<property name="keyring" ref="keyring" />
-	</bean>
-	<bean id="unregisterRemoteRepo"
-		class="org.argeo.slc.client.ui.dist.commands.UnregisterRemoteRepo"
-		scope="prototype">
 		<property name="nodeRepository" ref="nodeRepository" />
 	</bean>
 
-	<bean id="copyWorkspace" class="org.argeo.slc.client.ui.dist.commands.CopyWorkspace"
+	<bean id="manageWorkspaceAuth"
+		class="org.argeo.slc.client.ui.dist.commands.ManageWorkspaceAuth"
 		scope="prototype">
 		<property name="repository" ref="javaRepository" />
 	</bean>
-	<bean id="deleteWorkspace" class="org.argeo.slc.client.ui.dist.commands.DeleteWorkspace"
+
+	<bean id="publishWorkspace" class="org.argeo.slc.client.ui.dist.commands.PublishWorkspace">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+	<bean id="normalizeWorkspace"
+		class="org.argeo.slc.client.ui.dist.commands.NormalizeWorkspace">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+	<!-- WORKSPACE CRUD -->
+	<bean id="createWorkspace" class="org.argeo.slc.client.ui.dist.commands.CreateWorkspace">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+	<bean id="copyWorkspace" class="org.argeo.slc.client.ui.dist.commands.CopyWorkspace">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+	<bean id="copyLocalJavaWorkspace"
+		class="org.argeo.slc.client.ui.dist.commands.CopyLocalJavaWorkspace">
+		<property name="javaRepoManager">
+			<bean factory-bean="slcRepoManager" factory-method="getJavaRepoManager" />
+		</property>
+		<property name="javaRepository" ref="javaRepository" />
+	</bean>
+
+	<bean id="createLocalJavaWorkspace"
+		class="org.argeo.slc.client.ui.dist.commands.CreateLocalJavaWorkspace">
+		<property name="javaRepoManager">
+			<bean factory-bean="slcRepoManager" factory-method="getJavaRepoManager" />
+		</property>
+	</bean>
+
+
+	<bean id="mergeWorkspaces" class="org.argeo.slc.client.ui.dist.commands.MergeWorkspaces">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+	<bean id="deleteWorkspace" class="org.argeo.slc.client.ui.dist.commands.DeleteWorkspace">
+		<property name="repositoryFactory" ref="repositoryFactory" />
+		<property name="nodeRepository" ref="nodeRepository" />
+		<property name="keyring" ref="keyring" />
+	</bean>
+
+	<!-- ADVANCED -->
+	<bean id="runInOsgi" class="org.argeo.slc.client.ui.dist.commands.RunInOsgi"
 		scope="prototype">
 		<property name="repository" ref="javaRepository" />
 	</bean>
-	<bean id="manageWorkspaceAuth"
-		class="org.argeo.slc.client.ui.dist.commands.ManageWorkspaceAuth"
+
+
+	<!-- LEGACY -->
+	<bean id="org.argeo.slc.client.ui.dist.openGenericJcrQueryEditor"
+		class="org.argeo.eclipse.ui.jcr.commands.OpenGenericJcrQueryEditor"
 		scope="prototype">
-		<property name="repository" ref="javaRepository" />
+		<property name="editorId"
+			value="org.argeo.slc.client.ui.dist.genericJcrQueryEditor" />
 	</bean>
+
 	<bean id="refreshDistributionsView"
 		class="org.argeo.slc.client.ui.dist.commands.RefreshDistributionsView"
 		scope="prototype">
 	</bean>
-	<bean id="org.argeo.slc.client.ui.dist.deleteArtifacts" class="org.argeo.slc.client.ui.dist.commands.DeleteArtifacts"
-		scope="prototype">
-	</bean>
+
 	<bean id="refreshDistributionOverviewPage"
 		class="org.argeo.slc.client.ui.dist.commands.RefreshDistributionOverviewPage"
 		scope="prototype">
 	</bean>
 
-	<bean id="registerRepository"
-		class="org.argeo.slc.client.ui.dist.commands.RegisterRepository">
-		<property name="repositoryFactory" ref="repositoryFactory" />
-		<property name="nodeRepository" ref="nodeRepository" />
-		<property name="keyring" ref="keyring" />
+	<bean id="org.argeo.slc.client.ui.dist.deleteArtifacts" class="org.argeo.slc.client.ui.dist.commands.DeleteArtifacts"
+		scope="prototype">
 	</bean>
 
-</beans>
+</beans>
\ No newline at end of file