From 5b7a25eb2057d89aa56b284ad4590769760c5c44 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Jun 2020 10:14:34 +0200
Subject: [PATCH] Adapt services to the  introduction of CmsUserManager.

---
 .../OSGI-INF/activitiesMaintenanceService.xml            | 4 ++--
 org.argeo.suite.cms/OSGI-INF/activitiesService.xml       | 2 +-
 .../OSGI-INF/peopleMaintenanceService.xml                | 4 ++--
 org.argeo.suite.cms/OSGI-INF/peopleService.xml           | 4 ++--
 .../OSGI-INF/resourcesMaintenanceService.xml             | 6 +++---
 .../OSGI-INF/systemMaintenanceService.xml                | 9 ++++-----
 org.argeo.suite.cms/bnd.bnd                              | 1 +
 org.argeo.suite.e4.rap/build.properties                  | 9 +++------
 org.argeo.suite.e4/OSGI-INF/activitiesE4Service.xml      | 6 +++---
 org.argeo.suite.e4/OSGI-INF/peopleE4Service.xml          | 5 ++---
 org.argeo.suite.standard/build.properties                | 5 ++++-
 11 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
index 5f196ea..8d8728f 100644
--- a/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
@@ -4,7 +4,7 @@
    <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.cms.CmsUserManager" name="UserAdminService" policy="static"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" policy="static" target="(cn=connect)"/>
+   <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" policy="static"/>
    <property name="cn" type="String" value="activities"/>
 </scr:component>
diff --git a/org.argeo.suite.cms/OSGI-INF/activitiesService.xml b/org.argeo.suite.cms/OSGI-INF/activitiesService.xml
index 17362ac..e017305 100644
--- a/org.argeo.suite.cms/OSGI-INF/activitiesService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/activitiesService.xml
@@ -6,5 +6,5 @@
       <provide interface="org.argeo.activities.ActivitiesService"/>
       <provide interface="org.argeo.connect.AppService"/>
    </service>
-   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" 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.cms/OSGI-INF/peopleMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml
index 816607f..e50911b 100644
--- a/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml
@@ -4,7 +4,7 @@
    <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.cms.CmsUserManager" name="UserAdminService" policy="static"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" policy="static" target="(cn=connect)"/>
+   <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" policy="static"/>
    <property name="cn" type="String" value="people"/>
 </scr:component>
diff --git a/org.argeo.suite.cms/OSGI-INF/peopleService.xml b/org.argeo.suite.cms/OSGI-INF/peopleService.xml
index d666bd9..940bf10 100644
--- a/org.argeo.suite.cms/OSGI-INF/peopleService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/peopleService.xml
@@ -5,6 +5,6 @@
       <provide interface="org.argeo.connect.AppService"/>
       <provide interface="org.argeo.people.PeopleService"/>
    </service>
-   <reference bind="setResourcesService" cardinality="1..1" interface="org.argeo.connect.resources.ResourcesService" name="ResourcesService" policy="static"/>
-   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="UserAdminService" policy="static"/>
+   <reference bind="setResourcesService" cardinality="1..1" interface="org.argeo.connect.resources.ResourcesService" policy="static"/>
+   <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" 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 a422ac3..f1da4f1 100644
--- a/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
@@ -4,8 +4,8 @@
    <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.cms.CmsUserManager" name="UserAdminService" policy="static"/>
+   <reference bind="setResourcesService" cardinality="1..1" interface="org.argeo.connect.resources.ResourcesService" policy="static"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" policy="static" target="(cn=connect)"/>
+   <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" policy="static"/>
    <property name="cn" type="String" value="resources"/>
 </scr:component>
diff --git a/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml
index 8ab6b8f..9ee4a35 100644
--- a/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="true" name="System Maintenance Service">
-   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=connect)"/>
-   <service>
+   <implementation class="org.argeo.connect.core.DynamicSystemMaintenanceService"/>
+    <service>
       <provide interface="org.argeo.connect.SystemMaintenanceService"/>
    </service>
-   <reference bind="addAppService" cardinality="0..n" interface="org.argeo.connect.AppMaintenanceService" name="AppMaintenanceService" policy="static"/>
-   <implementation class="org.argeo.connect.core.DynamicSystemMaintenanceService"/>
-   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="UserAdminService" policy="static"/>
+   <reference bind="addAppService" cardinality="0..n" interface="org.argeo.connect.AppMaintenanceService" policy="static"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" policy="static" target="(cn=connect)"/>
    <property name="cn" type="String" value="system"/>
 </scr:component>
diff --git a/org.argeo.suite.cms/bnd.bnd b/org.argeo.suite.cms/bnd.bnd
index d56e771..fac8279 100644
--- a/org.argeo.suite.cms/bnd.bnd
+++ b/org.argeo.suite.cms/bnd.bnd
@@ -12,6 +12,7 @@ OSGI-INF/peopleMaintenanceService.xml
 Import-Package: javax.jcr,\
 javax.transaction,\
 org.osgi.service.useradmin,\
+org.argeo.cms,\
 org.argeo.connect,\
 org.argeo.activities,\
 org.argeo.people,\
diff --git a/org.argeo.suite.e4.rap/build.properties b/org.argeo.suite.e4.rap/build.properties
index 8a9000c..eaf4033 100644
--- a/org.argeo.suite.e4.rap/build.properties
+++ b/org.argeo.suite.e4.rap/build.properties
@@ -1,10 +1,7 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/systemE4Service.xml,\
-               OSGI-INF/activitiesE4Service.xml,\
-               OSGI-INF/peopleE4Service.xml,\
-               OSGI-INF/documentsE4Service.xml,\
-               e4xmi/argeo-suite-rap-addons.e4xmi,\
-               plugin.xml
+               plugin.xml,\
+               e4xmi/,\
+               OSGI-INF/
 source.. = src/
diff --git a/org.argeo.suite.e4/OSGI-INF/activitiesE4Service.xml b/org.argeo.suite.e4/OSGI-INF/activitiesE4Service.xml
index f6eaccb..7115835 100644
--- a/org.argeo.suite.e4/OSGI-INF/activitiesE4Service.xml
+++ b/org.argeo.suite.e4/OSGI-INF/activitiesE4Service.xml
@@ -1,10 +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="Activities Service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="Activities E4 Service">
    <implementation class="org.argeo.activities.e4.ActivitiesE4Service"/>
    <service>
       <provide interface="org.argeo.connect.ui.AppWorkbenchService"/>
       <provide interface="org.argeo.connect.e4.AppE4Service"/>
    </service>
-   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.connect.UserAdminService" name="UserAdminService" policy="static"/>
-   <reference bind="setActivitiesService" cardinality="1..1" interface="org.argeo.activities.ActivitiesService" name="ActivitiesService" policy="static"/>
+   <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" policy="static"/>
+   <reference bind="setActivitiesService" cardinality="1..1" interface="org.argeo.activities.ActivitiesService" policy="static"/>
 </scr:component>
diff --git a/org.argeo.suite.e4/OSGI-INF/peopleE4Service.xml b/org.argeo.suite.e4/OSGI-INF/peopleE4Service.xml
index 5855f4a..8e894f4 100644
--- a/org.argeo.suite.e4/OSGI-INF/peopleE4Service.xml
+++ b/org.argeo.suite.e4/OSGI-INF/peopleE4Service.xml
@@ -5,7 +5,6 @@
       <provide interface="org.argeo.connect.ui.AppWorkbenchService"/>
       <provide interface="org.argeo.connect.e4.AppE4Service"/>
    </service>
-   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.connect.UserAdminService" name="UserAdminService" policy="static"/>
-   <reference bind="setPeopleService" cardinality="1..1" interface="org.argeo.people.PeopleService" name="PeopleService" policy="static"/>
-   <reference bind="setResourcesService" cardinality="1..1" interface="org.argeo.connect.resources.ResourcesService" name="ResourcesService" policy="static"/>
+   <reference bind="setPeopleService" cardinality="1..1" interface="org.argeo.people.PeopleService" policy="static"/>
+   <reference bind="setResourcesService" cardinality="1..1" interface="org.argeo.connect.resources.ResourcesService" policy="static"/>
 </scr:component>
diff --git a/org.argeo.suite.standard/build.properties b/org.argeo.suite.standard/build.properties
index 34d2e4d..a2c90fd 100644
--- a/org.argeo.suite.standard/build.properties
+++ b/org.argeo.suite.standard/build.properties
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/,\
+               e4xmi/,\
+               plugin.xml
-- 
2.30.2