Adapt to changes in Argeo Platform.

diff --git a/lib/pom.xml b/lib/pom.xml
index 287598e450728f6ef7e6daa216495572ebe5e4a2..ce7d898e63d1f5b1c91ec56c7811c8fa1f1e1ab7 100644 (file)
--- 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 54f50d2b700894bafd2db2cb9f9f21f990937bad..5f196eafef278d54e2f8bfe2c242d50af811771a 100644 (file)
--- 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 c84eaa2a416976005cfe408d8c6b0d785503977e..17362ac3c5cad5775dde5ba9e42ab7b891002890 100644 (file)
--- 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 0b083cb13944b14f4b55c7544874f745ca8cb10d..816607fc49526e6b0e5b049a9ce9c319def7265d 100644 (file)
--- 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 0286f7c9dcf3638f6469d968b44b3fc733e7d47f..d666bd990b1a9b0816bf7533063e275c2bc1a904 100644 (file)
--- 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 06b3ebfc96d8232bf5ab0b77c81034117bb17703..a422ac3b5865ba273770d42be689cbb56f9a0ffa 100644 (file)
--- 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 01dfebdccfca6acafb19345b03a4cad0185f1ab8..8ab6b8fdba0c326768d8f5600e74d7d969db3a62 100644 (file)
--- 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 (file)
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 f5c82d4c79c9fe73217b712d68a275a1eeb424d3..d56e771dee55b44008cb136fb7e54fbabbf55a6e 100644 (file)
--- 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 994e739dd258c573074189acfac6b0cce1c6e074..2a1a10ae258db6e362cf12a1d04b55590dcfc717 100644 (file)
--- 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>