Provide SlcAgentFactory in the core agent

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

diff --git a/modules/org.argeo.slc.agent/META-INF/spring/agent.xml b/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
index bcb4d0a0504931c356c1758904aedf3e6e74b82b..2afd8f580a3c5f6d52bc69b7ddadcc145b73ead5 100644 (file)
--- a/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
+++ b/modules/org.argeo.slc.agent/META-INF/spring/agent.xml
@@ -4,6 +4,14 @@
        xsi:schemaLocation="\r
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
+       <bean\r
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
+               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />\r
+               <property name="locations">\r
+                       <value>osgibundle:agent.properties</value>\r
+               </property>\r
+       </bean>\r
+\r
        <!-- Manager -->\r
        <bean id="modulesManager" class="org.argeo.slc.osgi.OsgiExecutionModulesManager"\r
                init-method="init" destroy-method="destroy">\r
@@ -15,16 +23,6 @@
                <property name="defaultTimeout" value="${slc.agent.osgi.defaultTimeout}" />\r
        </bean>\r
 \r
-       <!-- Logging -->\r
-       <!-- <bean id="log4Notification" class="org.argeo.slc.log4j.SlcExecutionAppender" -->\r
-       <!-- init-method="init" destroy-method="destroy"> -->\r
-       <!-- <property name="disabled" value="${slc.agent.log4Notification.disabled}" \r
-               /> -->\r
-       <!-- <property name="level" value="${slc.agent.log4Notification.level}" \r
-               /> -->\r
-       <!-- <property name="onlyExecutionThread" -->\r
-       <!-- value="${slc.agent.log4Notification.onlyExecutionThread}" /> -->\r
-       <!-- </bean> -->\r
-\r
-\r
+       <!-- Agent Factory -->\r
+       <bean id="vmAgentFactory" class="org.argeo.slc.core.execution.DefaultAgentFactory" />\r
 </beans>
\ No newline at end of file