From 63bb1036480ff177c433584e91f946ab3686bf86 Mon Sep 17 00:00:00 2001
From: bsinou <bsinou@argeo.org>
Date: Sat, 1 Apr 2017 08:12:56 +0200
Subject: [PATCH] Fix spring bindings

---
 .../META-INF/spring/backend-services.xml        |  2 +-
 .../META-INF/spring/workbench-services.xml      | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/org.argeo.suite.apps/META-INF/spring/backend-services.xml b/org.argeo.suite.apps/META-INF/spring/backend-services.xml
index bae1034..3a6aad6 100644
--- a/org.argeo.suite.apps/META-INF/spring/backend-services.xml
+++ b/org.argeo.suite.apps/META-INF/spring/backend-services.xml
@@ -30,8 +30,8 @@
 
 	<!-- order is important -->
 	<util:list id="knownAppServices">
-		<ref bean="peopleService" />
 		<ref bean="trackerService" />
+		<ref bean="peopleService" />
 		<ref bean="documentsService" />
 		<ref bean="activitiesService" />
 		<ref bean="resourcesService" />
diff --git a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml
index ea46634..86b71a2 100644
--- a/org.argeo.suite.apps/META-INF/spring/workbench-services.xml
+++ b/org.argeo.suite.apps/META-INF/spring/workbench-services.xml
@@ -8,16 +8,25 @@
 		class="org.argeo.connect.resources.workbench.ResourcesWorkbenchService" />
 
 	<bean id="activitiesWorkbenchService"
-		class="org.argeo.activities.workbench.ActivitiesWorkbenchService" />
+		class="org.argeo.activities.workbench.ActivitiesWorkbenchService">
+		<property name="userAdminService" ref="userAdminService" />
+		<property name="activitiesService" ref="activitiesService" />
+	</bean>
+
 
 	<bean id="peopleWorkbenchService"
 		class="org.argeo.people.workbench.rap.PeopleWorkbenchServiceImpl" />
 
-	<bean id="documentsWorkbenchService"
-		class="org.argeo.documents.workbench.DocumentsWorkbenchService" />
+	<bean id="documentsWorkbenchService" class="org.argeo.documents.workbench.DocumentsWorkbenchService" />
+
+	<bean id="trackerWorkbenchService" class="org.argeo.tracker.workbench.TrackerWorkbenchService">
+		<property name="userAdminService" ref="userAdminService" />
+		<property name="trackerService" ref="trackerService" />
+	</bean>
 
-	<!--order is important -->
+	<!-- Order is important -->
 	<util:list id="knownWbServices">
+		<ref bean="trackerWorkbenchService" />
 		<ref bean="peopleWorkbenchService" />
 		<ref bean="documentsWorkbenchService" />
 		<ref bean="activitiesWorkbenchService" />
-- 
2.30.2