X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Forg.argeo.slc.agent%2FMETA-INF%2Fspring%2Fagent.xml;h=2afd8f580a3c5f6d52bc69b7ddadcc145b73ead5;hb=f86db0937b395c7fa96fa4bf4a29cc2c676fe3f5;hp=bcb4d0a0504931c356c1758904aedf3e6e74b82b;hpb=31b131c639e5c09bf50e15c2da44d93bf62dcfda;p=gpl%2Fargeo-slc.git

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 bcb4d0a05..2afd8f580 100644
--- 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="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="locations">
+			<value>osgibundle:agent.properties</value>
+		</property>
+	</bean>
+
 	<!-- Manager -->
 	<bean id="modulesManager" class="org.argeo.slc.osgi.OsgiExecutionModulesManager"
 		init-method="init" destroy-method="destroy">
@@ -15,16 +23,6 @@
 		<property name="defaultTimeout" value="${slc.agent.osgi.defaultTimeout}" />
 	</bean>
 
-	<!-- Logging -->
-	<!-- <bean id="log4Notification" class="org.argeo.slc.log4j.SlcExecutionAppender" -->
-	<!-- init-method="init" destroy-method="destroy"> -->
-	<!-- <property name="disabled" value="${slc.agent.log4Notification.disabled}" 
-		/> -->
-	<!-- <property name="level" value="${slc.agent.log4Notification.level}" 
-		/> -->
-	<!-- <property name="onlyExecutionThread" -->
-	<!-- value="${slc.agent.log4Notification.onlyExecutionThread}" /> -->
-	<!-- </bean> -->
-
-
+	<!-- Agent Factory -->
+	<bean id="vmAgentFactory" class="org.argeo.slc.core.execution.DefaultAgentFactory" />
 </beans>
\ No newline at end of file