From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 2 Mar 2020 08:23:44 +0000 (+0100)
Subject: Adapt to changes in Argeo Platform.
X-Git-Tag: argeo-suite-2.1.16~111
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=a878b1885d67c6f492ee5ca2d2831a6dd02b7a92

Adapt to changes in Argeo Platform.
---

diff --git a/lib/pom.xml b/lib/pom.xml
index 287598e..ce7d898 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -17,7 +17,7 @@
 		<!-- Dependencies -->
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-		<version.argeo-commons>2.1.86-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.88-SNAPSHOT</version.argeo-commons>
 		<version.argeo-connect>2.1.82-SNAPSHOT</version.argeo-connect>
 		<version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc>
 
diff --git a/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
index 54f50d2..5f196ea 100644
--- a/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
@@ -5,6 +5,6 @@
       <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="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="UserAdminService" 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 c84eaa2..17362ac 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.connect.UserAdminService" name="UserAdminService" policy="static"/>
+   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" 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 0b083cb..816607f 100644
--- a/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/peopleMaintenanceService.xml
@@ -5,6 +5,6 @@
       <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="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="UserAdminService" 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 0286f7c..d666bd9 100644
--- a/org.argeo.suite.cms/OSGI-INF/peopleService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/peopleService.xml
@@ -6,5 +6,5 @@
       <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.connect.UserAdminService" name="UserAdminService" policy="static"/>
+   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" 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 06b3ebf..a422ac3 100644
--- a/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/resourcesMaintenanceService.xml
@@ -6,6 +6,6 @@
    </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"/>
+   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="UserAdminService" 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 01dfebd..8ab6b8f 100644
--- a/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml
+++ b/org.argeo.suite.cms/OSGI-INF/systemMaintenanceService.xml
@@ -6,6 +6,6 @@
    </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.connect.UserAdminService" name="UserAdminService" policy="static"/>
+   <reference bind="setUserAdminService" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="UserAdminService" policy="static"/>
    <property name="cn" type="String" value="system"/>
 </scr:component>
diff --git a/org.argeo.suite.cms/OSGI-INF/userManagerService.xml b/org.argeo.suite.cms/OSGI-INF/userManagerService.xml
deleted file mode 100644
index f568a05..0000000
--- a/org.argeo.suite.cms/OSGI-INF/userManagerService.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="User Manager Service">
-   <implementation class="org.argeo.connect.core.UserAdminServiceImpl"/>
-   <service>
-      <provide interface="org.argeo.connect.UserAdminService"/>
-   </service>
-   <reference bind="setUserAdmin" cardinality="1..1" interface="org.osgi.service.useradmin.UserAdmin" name="UserAdmin" policy="static"/>
-   <reference bind="setUserTransaction" cardinality="1..1" interface="javax.transaction.UserTransaction" name="UserTransaction" policy="static"/>
-</scr:component>
diff --git a/org.argeo.suite.cms/bnd.bnd b/org.argeo.suite.cms/bnd.bnd
index f5c82d4..d56e771 100644
--- a/org.argeo.suite.cms/bnd.bnd
+++ b/org.argeo.suite.cms/bnd.bnd
@@ -1,6 +1,5 @@
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/systemAppService.xml,\
-OSGI-INF/userManagerService.xml,\
 OSGI-INF/resourcesService.xml,\
 OSGI-INF/activitiesService.xml,\
 OSGI-INF/peopleService.xml,\
diff --git a/pom.xml b/pom.xml
index 994e739..2a1a10a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 		<!-- Dependencies -->
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-		<version.argeo-commons>2.1.86-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.1.88-SNAPSHOT</version.argeo-commons>
 		<version.argeo-connect>2.1.82-SNAPSHOT</version.argeo-connect>
 		<version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc>