From 9514af4b44aef2485966b03aa11296eea0ed6b40 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 15 Sep 2020 08:10:55 +0200
Subject: [PATCH] Adapt Tracker to changes in Argeo Connect.

---
 org.argeo.suite.tracker/.project                          | 5 +++++
 org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml     | 2 +-
 .../OSGI-INF/trackerMaintenanceService.xml                | 2 +-
 org.argeo.suite.tracker/bnd.bnd                           | 2 ++
 org.argeo.suite.tracker/build.properties                  | 3 ++-
 sdk/argeo-office-e4-rap.properties                        | 8 ++++----
 6 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/org.argeo.suite.tracker/.project b/org.argeo.suite.tracker/.project
index e22cda3..b5e6542 100644
--- a/org.argeo.suite.tracker/.project
+++ b/org.argeo.suite.tracker/.project
@@ -20,6 +20,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml b/org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml
index f79ea3e..c768361 100644
--- a/org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml
+++ b/org.argeo.suite.tracker/OSGI-INF/trackerE4Service.xml
@@ -7,6 +7,6 @@
    </service>
    <property name="service.ranking" type="Integer" value="10"/>
    <reference bind="setActivitiesService" cardinality="1..1" interface="org.argeo.activities.ActivitiesService" name="ActivitiesService" policy="static"/>
-   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.connect.UserAdminService" name="UserAdminService" policy="static"/>
+   <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" policy="static"/>
    <reference bind="setTrackerService" cardinality="1..1" interface="org.argeo.tracker.TrackerService" name="TrackerService" policy="static"/>
 </scr:component>
diff --git a/org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml b/org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml
index 669f9c3..994282d 100644
--- a/org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml
+++ b/org.argeo.suite.tracker/OSGI-INF/trackerMaintenanceService.xml
@@ -5,5 +5,5 @@
       <provide interface="org.argeo.connect.AppMaintenanceService"/>
    </service>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=connect)"/>
-   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.connect.UserAdminService" name="UserAdminService" policy="static"/>
+   <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" policy="static"/>
 </scr:component>
diff --git a/org.argeo.suite.tracker/bnd.bnd b/org.argeo.suite.tracker/bnd.bnd
index 17336a4..72ab4d2 100644
--- a/org.argeo.suite.tracker/bnd.bnd
+++ b/org.argeo.suite.tracker/bnd.bnd
@@ -11,4 +11,6 @@ org.argeo.activities,\
 org.argeo.tracker,\
 org.argeo.tracker.core,\
 org.argeo.tracker.e4,\
+org.argeo.cms,\
+org.argeo.connect.ui,\
 *
diff --git a/org.argeo.suite.tracker/build.properties b/org.argeo.suite.tracker/build.properties
index 995c040..6dad7ac 100644
--- a/org.argeo.suite.tracker/build.properties
+++ b/org.argeo.suite.tracker/build.properties
@@ -2,5 +2,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                e4xmi/,\
-               plugin.xml
+               plugin.xml,\
+               OSGI-INF/
 source.. = src/
diff --git a/sdk/argeo-office-e4-rap.properties b/sdk/argeo-office-e4-rap.properties
index 61c678c..0002618 100644
--- a/sdk/argeo-office-e4-rap.properties
+++ b/sdk/argeo-office-e4-rap.properties
@@ -11,10 +11,10 @@ argeo.osgi.start.3.node=\
 org.argeo.cms
 
 argeo.osgi.start.5.suite=\
-org.argeo.suite.cms
-
-argeo.osgi.start.5.suite=\
-org.argeo.suite.e4.rap
+org.argeo.suite.cms,\
+org.argeo.suite.e4.rap,\
+org.argeo.suite.standard,\
+org.argeo.suite.tracker
 
 # Local
 argeo.node.repo.type=h2
-- 
2.30.2