Simplify SLC and use Argeo Commons

[gpl/argeo-slc.git] / modules / server / org.argeo.slc.webapp.war / WEB-INF / osgi.xml

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
index a75bac77a67301a1c3c021a0ac73599b57482d4b..d7dde2d34d92e1c5f044efd1a140004391667b4b 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
@@ -6,6 +6,9 @@
        http://www.springframework.org/schema/beans   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
+       <reference id="marshaller" interface="org.springframework.oxm.Marshaller" />\r
+       <reference id="unmarshaller" interface="org.springframework.oxm.Unmarshaller" />\r
+\r
        <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"\r
                id="testResultDao" />\r
        <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"\r
@@ -23,11 +26,9 @@
                <reference interface="org.argeo.slc.execution.ExecutionModulesManager"\r
                id="modulesManager" />\r
        -->\r
-       <reference id="testManagerService"\r
-               interface="org.argeo.slc.services.test.TestManagerService" />\r
-       <reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />\r
-       <reference id="slcExecutionService"\r
-               interface="org.argeo.slc.services.process.SlcExecutionService" />\r
+       <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r
+       <reference id="agentService" interface="org.argeo.slc.services.AgentService" />\r
+       <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
 \r
        <reference id="hibernateTransactionManager"\r
                interface="org.springframework.transaction.PlatformTransactionManager"\r
@@ -43,5 +44,14 @@
        <!-- Runtime -->\r
        <reference id="dynamicRuntime" interface="org.argeo.slc.deploy.DynamicRuntime" />\r
 \r
+       <!-- Provisioning -->\r
+       <set id="modularDistributions" interface="org.argeo.slc.build.ModularDistribution"\r
+               cardinality="0..N" />\r
+\r
+       <!-- Security -->\r
+       <!-- <reference id="authenticationEntryPoint"\r
+               interface="org.springframework.security.ui.AuthenticationEntryPoint" />-->\r
+       <reference id="_authenticationManager"\r
+               interface="org.springframework.security.AuthenticationManager" />\r
 \r
 </beans:beans>
\ No newline at end of file