Improve POM

[gpl/argeo-slc.git] / modules / org.argeo.slc.agent / META-INF / spring / osgi.xml

diff --git a/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml b/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml
index 1756f89edc46d1e580bb03dfb17a049d6b5e4536..f22371189d8ceb7b4c4d203f0e6cf4afb9570aee 100644 (file)
--- a/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml
+++ b/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml
@@ -8,6 +8,7 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
        <!-- REFERENCES -->\r
+       <!-- No <set> so that the equals methods are not called -->\r
        <list id="executionContexts" interface="org.argeo.slc.execution.ExecutionContext"\r
                cardinality="0..N">\r
                <listener ref="modulesManager" bind-method="register"\r
@@ -26,29 +27,26 @@
                        unbind-method="unregister" />\r
        </list>\r
 \r
-       <!-- No sets so that the equals methods are not called -->\r
        <list id="executionFlowDescriptorConverters"\r
                interface="org.argeo.slc.execution.ExecutionFlowDescriptorConverter"\r
                cardinality="0..N">\r
                <listener ref="modulesManager" />\r
        </list>\r
 \r
-       <list id="slcExecutionListeners" interface="org.argeo.slc.process.SlcExecutionNotifier"\r
-               cardinality="0..N" />\r
-\r
-       <list id="agents" interface="org.argeo.slc.runtime.SlcAgent"\r
-               cardinality="0..N">\r
-               <listener ref="vmAgentFactory" bind-method="register"\r
-                       unbind-method="unregister" />\r
-       </list>\r
-\r
        <!-- SERVICES -->\r
        <service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
 \r
-       <service ref="vmAgentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory">\r
-               <service-properties>\r
-                       <beans:entry key="argeo.slc.jcr.path" value="/slc:system/slc:agents/slc:vm" />\r
-               </service-properties>\r
-       </service>\r
+       <!-- LABEL -->\r
+       <beans:bean class="org.argeo.security.core.OsgiModuleLabel">\r
+               <beans:property name="bundleContext" ref="bundleContext" />\r
+       </beans:bean>\r
+\r
+       <!-- ROLES -->\r
+       <reference id="userAdminService" interface="org.argeo.security.UserAdminService" />\r
 \r
+       <beans:bean class="org.argeo.security.core.SimpleRoleRegistration"\r
+               init-method="run">\r
+               <beans:property name="role" value="ROLE_SLC" />\r
+               <beans:property name="userAdminService" ref="userAdminService" />\r
+       </beans:bean>\r
 </beans:beans>
\ No newline at end of file