Adapt components to changes in Connect

diff --git a/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
index 6d8105f0e093dc1a9105b9564c63151f12b7f57b..7352713cc182e815f4319a8811dec88e33963853 100644 (file)
--- 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 0aa87053a286d3cec2e7444d4c0bffa30d3eb47d..aa8e914935c1b9a401744dc0bfb3e48259c38d49 100644 (file)
--- 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 5385eb2b9b0b5333460d471065ce8d55588cc188..f417bd6583be3e43791cb262f5521b5d6a243f21 100644 (file)
--- 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 ec9fa7c6eb7d7c49cc9c79410a2af37eea9e02f7..669f9c32d1c64e49eef2931ff8867ea6ccd79b53 100644 (file)
--- 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>