Fix spring bindings

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 bae10344d3e25d2b2795b8c3c2f0bc7dcd3c6c8f..3a6aad6c4e5a527e80f41d47aadc7dd38875c02c 100644 (file)
--- 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 @@
 \r
        <!-- order is important -->\r
        <util:list id="knownAppServices">\r
-               <ref bean="peopleService" />\r
                <ref bean="trackerService" />\r
+               <ref bean="peopleService" />\r
                <ref bean="documentsService" />\r
                <ref bean="activitiesService" />\r
                <ref bean="resourcesService" />\r

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 ea46634238f957fa7e6d1faa1262f12d9108d00a..86b71a259b4c119c07d7bd4ae72009a02b6491d5 100644 (file)
--- 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" />\r
 \r
        <bean id="activitiesWorkbenchService"\r
-               class="org.argeo.activities.workbench.ActivitiesWorkbenchService" />\r
+               class="org.argeo.activities.workbench.ActivitiesWorkbenchService">\r
+               <property name="userAdminService" ref="userAdminService" />\r
+               <property name="activitiesService" ref="activitiesService" />\r
+       </bean>\r
+\r
 \r
        <bean id="peopleWorkbenchService"\r
                class="org.argeo.people.workbench.rap.PeopleWorkbenchServiceImpl" />\r
 \r
-       <bean id="documentsWorkbenchService"\r
-               class="org.argeo.documents.workbench.DocumentsWorkbenchService" />\r
+       <bean id="documentsWorkbenchService" class="org.argeo.documents.workbench.DocumentsWorkbenchService" />\r
+\r
+       <bean id="trackerWorkbenchService" class="org.argeo.tracker.workbench.TrackerWorkbenchService">\r
+               <property name="userAdminService" ref="userAdminService" />\r
+               <property name="trackerService" ref="trackerService" />\r
+       </bean>\r
 \r
-       <!--order is important -->\r
+       <!-- Order is important -->\r
        <util:list id="knownWbServices">\r
+               <ref bean="trackerWorkbenchService" />\r
                <ref bean="peopleWorkbenchService" />\r
                <ref bean="documentsWorkbenchService" />\r
                <ref bean="activitiesWorkbenchService" />\r