Adapt services to the introduction of CmsUserManager.

diff --git a/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml b/org.argeo.suite.cms/OSGI-INF/activitiesMaintenanceService.xml
index 5f196eafef278d54e2f8bfe2c242d50af811771a..8d8728ff52fb41d8d3d178d3343e063c58600f59 100644 (file)
--- 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 17362ac3c5cad5775dde5ba9e42ab7b891002890..e017305094d3d235ac28a35f155cbcf354311143 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.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 816607fc49526e6b0e5b049a9ce9c319def7265d..e50911b2e8f5a328a22947a938560248cd185058 100644 (file)
--- 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 d666bd990b1a9b0816bf7533063e275c2bc1a904..940bf109e38c69ffcfc4c7c4c0680f05c25801f4 100644 (file)
--- 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 a422ac3b5865ba273770d42be689cbb56f9a0ffa..f1da4f1d5bc1110ec3e2ed06e106589ee85b7ebe 100644 (file)
--- 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 8ab6b8fdba0c326768d8f5600e74d7d969db3a62..9ee4a356e8c16938e9ed65e4492f7d39a606acb6 100644 (file)
--- 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 d56e771dee55b44008cb136fb7e54fbabbf55a6e..fac8279cb4f967701a68fc11152fb2fc70c2c307 100644 (file)
--- 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 8a9000c1c55b3853b73fcb8af8a0c758f222206c..eaf403393d476a172568509c1d3793709b7e81f3 100644 (file)
--- 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 f6eaccb28dc392df00c84c7eee6e56203fafe2bd..71158359b011de6e2ccc1f47c7665696555ca19b 100644 (file)
--- 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 5855f4a58c4931cc6b93d4244c0e342cc1d55944..8e894f4089c865f7fdbebd05eb89d4c407e6e2e3 100644 (file)
--- 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 34d2e4d2dad529ceaeb953bfcdb63c51d69ffed2..a2c90fd13ef261d460ef43254f646e6e4f2d3a5a 100644 (file)
--- 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