X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.server.services%2FMETA-INF%2Fspring%2Fservices.xml;h=45406600f7a26e98ec361aed3a154b36d951d0c4;hb=447eb6d46529f0760cd35a4d18f53e6f4cba562c;hp=debb1c458daad11e50dce08110984554a4c47561;hpb=693cc53b426d088e49d746585bf7c5e197fc3998;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
index debb1c458..45406600f 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
@@ -7,6 +7,16 @@
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+		<property name="locations">
+			<value>osgibundle:services.properties
+			</value>
+		</property>
+	</bean>
+
 	<!-- Services -->
 	<bean id="testManagerService" class="org.argeo.slc.services.impl.test.TestManagerServiceImpl">
 		<constructor-arg ref="testResultDao" />
@@ -17,23 +27,22 @@
 
 	<bean id="agentService" class="org.argeo.slc.services.impl.runtime.AgentServiceImpl">
 		<constructor-arg ref="slcAgentDescriptorDao" />
+		<constructor-arg ref="agentFactory" />
+		<property name="pingCycle" value="${slc.server.services.pingCycle}" />
 	</bean>
 
-	<bean id="slcExecutionService" class="org.argeo.slc.services.impl.process.SlcExecutionServiceImpl">
+	<bean id="slcExecutionService"
+		class="org.argeo.slc.services.impl.process.SlcExecutionServiceImpl">
 		<constructor-arg ref="slcExecutionDao" />
 	</bean>
 
-	<!-- Services transactions -->
-	<aop:config>
-		<aop:pointcut id="serviceMethods"
-			expression="execution(* org.argeo.slc.services.test.TestManagerService.*(..))" />
-		<aop:advisor advice-ref="serviceAdvice" pointcut-ref="serviceMethods" />
-	</aop:config>
-
-	<tx:advice id="serviceAdvice" transaction-manager="transactionManager">
-		<tx:attributes>
-			<tx:method name="*" propagation="REQUIRED" />
-		</tx:attributes>
-	</tx:advice>
-
+	<!--
+		Services transactions <aop:config> <aop:pointcut id="serviceMethods"
+		expression="execution(*
+		org.argeo.slc.services.test.TestManagerService.*(..))" /> <aop:advisor
+		advice-ref="serviceAdvice" pointcut-ref="serviceMethods" />
+		</aop:config> <tx:advice id="serviceAdvice"
+		transaction-manager="transactionManager"> <tx:attributes> <tx:method
+		name="*" propagation="REQUIRED" /> </tx:attributes> </tx:advice>
+	-->
 </beans>
\ No newline at end of file