From: bsinou <bsinou@argeo.org>
Date: Wed, 22 Feb 2017 16:47:39 +0000 (+0100)
Subject: Clean spring files
X-Git-Tag: argeo-suite-0.1.5~22
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=16e21d016c7fa749ba418607f3cc71ac7e419451

Clean spring files
---

diff --git a/org.argeo.suite.core/META-INF/spring/services.xml b/org.argeo.suite.core/META-INF/spring/services.xml
index 31dc32e..fe6b791 100644
--- a/org.argeo.suite.core/META-INF/spring/services.xml
+++ b/org.argeo.suite.core/META-INF/spring/services.xml
@@ -32,7 +32,7 @@
 		<ref bean="trackerMaintenanceService" />
 	</util:list>
 
-	<!-- Make the DJ-aying between the various known Apps Maintenance  -->
+	<!-- Make the DJ-aying between the various known Apps Maintenance -->
 	<bean id="suiteMaintenanceService" class="org.argeo.suite.core.DefaultSuiteMaintenanceService"
 		init-method="init" destroy-method="destroy">
 		<property name="repository" ref="repository" />
@@ -40,7 +40,7 @@
 		<property name="maintenanceServices" ref="knownMaintenanceServices" />
 	</bean>
 
-	<!--  APP SERVICES (backends) -->
+	<!-- APP SERVICES (backends) -->
 	<bean id="resourcesService" class="org.argeo.connect.resources.core.ResourcesServiceImpl" />
 
 	<bean id="activitiesService" class="org.argeo.connect.activities.core.ActivitiesServiceImpl">
@@ -53,7 +53,9 @@
 		<property name="resourcesService" ref="resourcesService" />
 	</bean>
 
-	<bean id="trackerService" class="org.argeo.connect.tracker.core.TrackerServiceImpl" />
+	<bean id="trackerService" class="org.argeo.connect.tracker.core.TrackerServiceImpl">
+		<property name="activitiesService" ref="activitiesService" />
+	</bean>
 
 	<bean id="documentsService" class="org.argeo.connect.documents.DocumentsService" />
 
@@ -65,7 +67,7 @@
 		<property name="documentsService" ref="documentsService" />
 	</bean>
 
-	<!--  VARIOUS -->
+	<!-- VARIOUS -->
 
 	<!-- Execute initialization with a system authentication -->
 	<bean
diff --git a/org.argeo.suite.core/src/org/argeo/suite/ArgeoSuiteRole.java b/org.argeo.suite.core/src/org/argeo/suite/ArgeoSuiteRole.java
index 0b19f66..31ddca3 100644
--- a/org.argeo.suite.core/src/org/argeo/suite/ArgeoSuiteRole.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/ArgeoSuiteRole.java
@@ -8,7 +8,7 @@ public enum ArgeoSuiteRole {
 	coworker, manager;
 
 	public String dn() {
-		return new StringBuilder(LdapAttrs.cn.name()).append("=").append(SuiteConstants.AS_DOMAIN_PREFIX).append(".")
+		return new StringBuilder(LdapAttrs.cn.name()).append("=").append(SuiteConstants.SUITE_APP_PREFIX).append(".")
 				.append(name()).append(",").append(NodeConstants.ROLES_BASEDN).toString();
 	}
 }
diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteConstants.java b/org.argeo.suite.core/src/org/argeo/suite/SuiteConstants.java
index 26f2aac..06c28e4 100644
--- a/org.argeo.suite.core/src/org/argeo/suite/SuiteConstants.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/SuiteConstants.java
@@ -3,5 +3,7 @@ package org.argeo.suite;
 /** Argeo Suite constants */
 public interface SuiteConstants {
 
-	String AS_DOMAIN_PREFIX = "org.argeo.suite";
+	String SUITE_APP_PREFIX = "org.argeo.suite";
+	String SUITE_APP_BASE_NAME = "suite";
+
 }
diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java
index 02eda61..cb34993 100644
--- a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java
@@ -15,6 +15,7 @@ import org.argeo.connect.resources.ResourcesTypes;
 import org.argeo.connect.tracker.TrackerService;
 import org.argeo.connect.tracker.TrackerTypes;
 import org.argeo.connect.util.ConnectJcrUtils;
+import org.argeo.suite.SuiteConstants;
 
 public class DefaultSuiteAppService implements AppService {
 
@@ -26,12 +27,29 @@ public class DefaultSuiteAppService implements AppService {
 
 	@Override
 	public String getAppBaseName() {
-		return null;
+		return SuiteConstants.SUITE_APP_BASE_NAME;
 	}
 
 	@Override
 	public String getDefaultRelPath(Node entity) throws RepositoryException {
-		return null;
+		if (ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_TAG_PARENT)
+				|| ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_NODE_TEMPLATE)
+				|| ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_ENCODED_TAG)
+				|| ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_TAG))
+			return resourcesService.getDefaultRelPath(entity);
+		else if (ConnectJcrUtils.isNodeType(entity, TrackerTypes.TRACKER_PROJECT))
+			return trackerService.getDefaultRelPath(entity);
+		else if (ConnectJcrUtils.isNodeType(entity, ActivitiesTypes.ACTIVITIES_TASK)
+				|| ConnectJcrUtils.isNodeType(entity, ActivitiesTypes.ACTIVITIES_ACTIVITY))
+			return activitiesService.getDefaultRelPath(entity);
+		else if (ConnectJcrUtils.isNodeType(entity, PeopleTypes.PEOPLE_PERSON)
+				|| ConnectJcrUtils.isNodeType(entity, PeopleTypes.PEOPLE_ORG))
+			return peopleService.getDefaultRelPath(entity);
+		else if (ConnectJcrUtils.isNodeType(entity, NodeType.NT_FILE)
+				|| ConnectJcrUtils.isNodeType(entity, NodeType.NT_FOLDER))
+			return documentsService.getDefaultRelPath(entity);
+		else
+			return null;
 	}
 
 	@Override
@@ -44,8 +62,8 @@ public class DefaultSuiteAppService implements AppService {
 	public Node saveEntity(Node entity, boolean publish) {
 		if (ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_TAG_PARENT)
 				|| ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_NODE_TEMPLATE)
-				|| ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_TAG_ENCODED_INSTANCE)
-				|| ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_TAG_INSTANCE))
+				|| ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_ENCODED_TAG)
+				|| ConnectJcrUtils.isNodeType(entity, ResourcesTypes.RESOURCES_TAG))
 			return resourcesService.saveEntity(entity, publish);
 		else if (ConnectJcrUtils.isNodeType(entity, TrackerTypes.TRACKER_PROJECT))
 			return trackerService.saveEntity(entity, publish);
diff --git a/org.argeo.suite.web/META-INF/spring/people.xml b/org.argeo.suite.web/META-INF/spring/people.xml
index 0fdd501..f42e1b7 100644
--- a/org.argeo.suite.web/META-INF/spring/people.xml
+++ b/org.argeo.suite.web/META-INF/spring/people.xml
@@ -60,7 +60,7 @@
 		<entry>
 			<key>
 				<util:constant
-					static-field="org.argeo.connect.resources.ResourcesTypes.RESOURCES_TAG_INSTANCE" />
+					static-field="org.argeo.connect.resources.ResourcesTypes.RESOURCES_TAG" />
 			</key>
 			<bean class="org.argeo.connect.people.web.pages.TagLikeInstancePage">
 				<property name="peopleService" ref="peopleService" />
diff --git a/org.argeo.suite.workbench.rap/META-INF/spring/services.xml b/org.argeo.suite.workbench.rap/META-INF/spring/services.xml
index 0d73968..e06bff6 100644
--- a/org.argeo.suite.workbench.rap/META-INF/spring/services.xml
+++ b/org.argeo.suite.workbench.rap/META-INF/spring/services.xml
@@ -5,6 +5,9 @@
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
 	<!-- Assembly of the various AppWorkbenchServices -->
+	<bean id="resourcesWorkbenchService"
+		class="org.argeo.connect.resources.workbench.ResourcesWorkbenchService" />
+
 	<bean id="activitiesWorkbenchService"
 		class="org.argeo.connect.activities.workbench.ActivitiesWorkbenchService" />
 
@@ -16,13 +19,13 @@
 
 	<!--order is important -->
 	<util:list id="knownWbServices">
-		<ref bean="activitiesWorkbenchService" />
 		<ref bean="peopleWorkbenchService" />
 		<ref bean="documentsWorkbenchService" />
+		<ref bean="activitiesWorkbenchService" />
+		<ref bean="resourcesWorkbenchService" />
 	</util:list>
 
-	<bean id="suiteWorkbenchService" class="org.argeo.suite.workbench.AsWorkbenchServiceImpl">
+	<bean id="suiteWorkbenchService" class="org.argeo.suite.workbench.SuiteWorkbenchService">
 		<property name="knownAppWbServices" ref="knownWbServices" />
 	</bean>
-
-</beans>
\ No newline at end of file
+</beans>
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/AsWorkbenchServiceImpl.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/AsWorkbenchServiceImpl.java
deleted file mode 100644
index 73bfdbd..0000000
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/AsWorkbenchServiceImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.argeo.suite.workbench;
-
-import java.util.List;
-
-import javax.jcr.Node;
-
-import org.argeo.connect.ui.workbench.AppWorkbenchService;
-import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.suite.workbench.parts.DefaultDashboardEditor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.graphics.Image;
-
-/** Centralize workbench services from the various base apps */
-public class AsWorkbenchServiceImpl implements AppWorkbenchService {
-
-	// Injected known AppWorkbenchServices: order is important, first found
-	// result will be returned by the various methods.
-	private List<AppWorkbenchService> knownAppWbServices;
-
-	@Override
-	public String getDefaultEditorId() {
-		return DefaultDashboardEditor.ID;
-	}
-
-	// @Override
-	// public String getOpenEntityEditorCmdId() {
-	//// String result = null;
-	//// for (AppWorkbenchService appWbService : knownAppWbServices) {
-	//// result = appWbService.getOpenEntityEditorCmdId();
-	//// if (EclipseUiUtils.notEmpty(result))
-	//// return result;
-	//// }
-	// return OpenEntityEditor.ID;
-	// }
-
-	// @Override
-	// public String getOpenSearchEntityEditorCmdId() {
-	// String result = null;
-	// for (AppWorkbenchService appWbService : knownAppWbServices) {
-	// result = appWbService.getOpenSearchEntityEditorCmdId();
-	// if (EclipseUiUtils.notEmpty(result))
-	// return result;
-	// }
-	// return null;
-	// }
-
-	@Override
-	public String getEntityEditorId(Node entity) {
-		String result = null;
-		for (AppWorkbenchService appWbService : knownAppWbServices) {
-			result = appWbService.getEntityEditorId(entity);
-			if (EclipseUiUtils.notEmpty(result))
-				return result;
-		}
-		return null;
-	}
-
-	@Override
-	public String getSearchEntityEditorId(String nodeType) {
-		String result = null;
-		for (AppWorkbenchService appWbService : knownAppWbServices) {
-			result = appWbService.getSearchEntityEditorId(nodeType);
-			if (EclipseUiUtils.notEmpty(result))
-				return result;
-		}
-		return null;
-	}
-
-	@Override
-	public Image getIconForType(Node entity) {
-		Image result = null;
-		for (AppWorkbenchService appWbService : knownAppWbServices) {
-			result = appWbService.getIconForType(entity);
-			if (result != null)
-				return result;
-		}
-		return null;
-	}
-
-	@Override
-	public Wizard getCreationWizard(Node node) {
-		Wizard result = null;
-		for (AppWorkbenchService appWbService : knownAppWbServices) {
-			result = appWbService.getCreationWizard(node);
-			if (result != null)
-				return result;
-		}
-		return null;
-	}
-
-	@Override
-	public String getOpenFileCmdId() {
-		return null;
-	}
-
-	/* DEPENDENCY INJECTION */
-	public void setKnownAppWbServices(List<AppWorkbenchService> knownAppWbServices) {
-		this.knownAppWbServices = knownAppWbServices;
-	}
-}
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchService.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchService.java
new file mode 100644
index 0000000..17697ee
--- /dev/null
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/SuiteWorkbenchService.java
@@ -0,0 +1,73 @@
+package org.argeo.suite.workbench;
+
+import java.util.List;
+
+import javax.jcr.Node;
+
+import org.argeo.connect.ui.workbench.AppWorkbenchService;
+import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.suite.workbench.parts.DefaultDashboardEditor;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.graphics.Image;
+
+/** Centralize workbench services from the various base apps */
+public class SuiteWorkbenchService implements AppWorkbenchService {
+
+	// Injected known AppWorkbenchServices: order is important, first found
+	// result will be returned by the various methods.
+	private List<AppWorkbenchService> knownAppWbServices;
+
+	@Override
+	public String getDefaultEditorId() {
+		return DefaultDashboardEditor.ID;
+	}
+
+	@Override
+	public String getEntityEditorId(Node entity) {
+		String result = null;
+		for (AppWorkbenchService appWbService : knownAppWbServices) {
+			result = appWbService.getEntityEditorId(entity);
+			if (EclipseUiUtils.notEmpty(result))
+				return result;
+		}
+		return null;
+	}
+
+	@Override
+	public String getSearchEntityEditorId(String nodeType) {
+		String result = null;
+		for (AppWorkbenchService appWbService : knownAppWbServices) {
+			result = appWbService.getSearchEntityEditorId(nodeType);
+			if (EclipseUiUtils.notEmpty(result))
+				return result;
+		}
+		return null;
+	}
+
+	@Override
+	public Image getIconForType(Node entity) {
+		Image result = null;
+		for (AppWorkbenchService appWbService : knownAppWbServices) {
+			result = appWbService.getIconForType(entity);
+			if (result != null)
+				return result;
+		}
+		return null;
+	}
+
+	@Override
+	public Wizard getCreationWizard(Node node) {
+		Wizard result = null;
+		for (AppWorkbenchService appWbService : knownAppWbServices) {
+			result = appWbService.getCreationWizard(node);
+			if (result != null)
+				return result;
+		}
+		return null;
+	}
+
+	/* DEPENDENCY INJECTION */
+	public void setKnownAppWbServices(List<AppWorkbenchService> knownAppWbServices) {
+		this.knownAppWbServices = knownAppWbServices;
+	}
+}
diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
index db04a73..4582f77 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
@@ -90,6 +90,6 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 		ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tasks",
 				ActivitiesTypes.ACTIVITIES_TASK);
 		ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tags",
-				ResourcesTypes.RESOURCES_TAG_INSTANCE);
+				ResourcesTypes.RESOURCES_TAG);
 	}
 }