From bced6a9d2691d54113f40f64f92d7967adff67f6 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 16 May 2018 13:12:41 +0200
Subject: [PATCH] Adapt components to changes in Connect

---
 org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml | 4 +++-
 org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml     | 4 +++-
 org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml  | 4 +++-
 org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml    | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
index 6d8105f..7352713 100644
--- a/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="Activities Maintenance Service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="true" name="Activities Maintenance Service">
    <implementation class="org.argeo.activities.core.ActivitiesMaintenanceService"/>
    <service>
       <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"/>
 </scr:component>
diff --git a/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml
index 0aa8705..aa8e914 100644
--- a/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="People Maintenance Service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="true" name="People Maintenance Service">
    <implementation class="org.argeo.people.core.PeopleMaintenanceService"/>
    <service>
       <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"/>
 </scr:component>
diff --git a/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
index 5385eb2..f417bd6 100644
--- a/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="Resources Maintenance Service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="true" name="Resources Maintenance Service">
    <implementation class="org.argeo.connect.resources.core.ResourcesMaintenanceService"/>
    <service>
       <provide interface="org.argeo.connect.AppMaintenanceService"/>
    </service>
    <reference bind="setResourcesService" cardinality="1..1" interface="org.argeo.connect.resources.ResourcesService" name="ResourcesService" policy="static"/>
+   <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"/>
 </scr:component>
diff --git a/org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml
index ec9fa7c..669f9c3 100644
--- a/org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/trackerMaintenanceService.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="Tracker Maintenance Service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="true" name="Tracker Maintenance Service">
    <implementation class="org.argeo.tracker.core.TrackerMaintenanceService"/>
    <service>
       <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"/>
 </scr:component>
-- 
2.30.2