Adapt to changes in Commons

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

diff --git a/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml b/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
index 87bc30dd167c692674f6d71027230601342c3eb5..0b80c6e966c1935d345857703e993cf1e4eacce9 100644 (file)
--- a/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
+++ b/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
@@ -6,11 +6,7 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-       <service ref="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
-       <service ref="agentService" interface="org.argeo.slc.services.AgentService" />
-       <service ref="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
-       <service ref="attachmentsStorage" interface="org.argeo.slc.core.attachment.AttachmentsStorage" />
-
+       <!-- REFERENCES -->
        <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
                id="testResultDao" />
        <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
@@ -22,17 +18,25 @@
        <reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
                id="slcAgentDescriptorDao" />
 
-       <!--
-               <reference id="transactionManager"
-               interface="org.springframework.transaction.PlatformTransactionManager"
-               />
-       -->
-
        <reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />
 
        <list id="eventPublishers" interface="org.argeo.slc.msg.event.SlcEventPublisher"
                cardinality="0..N" />
 
-       <reference id="securityService" interface="org.argeo.security.ArgeoSecurityService" />
+       <reference id="systemExecutor" interface="org.argeo.security.SystemExecutionService" />
+
+       <!-- SERVICES -->
+       <service ref="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
+       <service ref="agentService" interface="org.argeo.slc.services.AgentService" />
+       <service ref="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
+       <service ref="attachmentsStorage">
+               <interfaces>
+                       <beans:value>org.argeo.slc.core.attachment.AttachmentsStorage
+                       </beans:value>
+                       <beans:value>org.argeo.slc.core.attachment.AttachmentUploader
+                       </beans:value>
+               </interfaces>
+       </service>
+
 
 </beans:beans>
\ No newline at end of file