From 447eb6d46529f0760cd35a4d18f53e6f4cba562c Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 28 Apr 2009 08:21:20 +0000
Subject: [PATCH] Make some properties externally configurable

git-svn-id: https://svn.argeo.org/slc/trunk@2387 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/activemq.xml                     |  9 +--------
 .../activemq.properties                              |  1 +
 .../org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF   |  4 ++--
 .../META-INF/MANIFEST.MF                             |  3 ++-
 .../META-INF/spring/services.xml                     | 12 +++++++++++-
 .../services.properties                              |  1 +
 6 files changed, 18 insertions(+), 12 deletions(-)
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/services.properties

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
index 669582083..f3c4b3194 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
@@ -45,18 +45,11 @@
 		</property>
 	</bean>
 
-
-	<!--
-		<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="classpath:activemq-conf.xml" />
-		<property name="start" value="true" /> </bean>
-	-->
-
 	<bean id="agentFactory" class="org.argeo.slc.jms.JmsAgentProxyFactory">
 		<property name="jmsTemplate">
 			<bean class="org.springframework.jms.core.JmsTemplate">
 				<property name="connectionFactory" ref="jmsConnectionFactory" />
-				<property name="receiveTimeout" value="20000" />
+				<property name="receiveTimeout" value="${slc.server.jms.agentProxy.timeout}" />
 			</bean>
 		</property>
 		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq.properties b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq.properties
index fea137cf6..d9a9e27d3 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq.properties
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq.properties
@@ -1 +1,2 @@
 slc.server.jms.url=tcp://localhost:61616
+slc.server.jms.agentProxy.timeout=20000
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF
index 391fff9ff..e5f2aca31 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jdbc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Bundle-SymbolicName: org.argeo.slc.server.jdbc
 Bundle-Version: 0.11.3.qualifier
 Fragment-Host: org.springframework.jdbc
 Import-Package: 
- org.hsqldb;resolution:=optional,
+ com.mysql.jdbc;resolution:=optional,
  net.sourceforge.jtds.jdbc;resolution:=optional,
- com.mysql.jdbc;resolution:=optional
+ org.hsqldb;resolution:=optional
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
index dec14f39e..6e76992e2 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Import-Package: org.hibernate.jdbc,
  org.springframework.transaction,
  org.springframework.aop,
  org.springframework.aop.framework,
- org.aopalliance.aop
+ org.aopalliance.aop,
+ org.springframework.beans.factory.config
 Require-Bundle: org.argeo.slc.server,
  org.argeo.slc.specs,
  org.argeo.slc.support.simple
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 6ae0a3b85..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" />
@@ -18,7 +28,7 @@
 	<bean id="agentService" class="org.argeo.slc.services.impl.runtime.AgentServiceImpl">
 		<constructor-arg ref="slcAgentDescriptorDao" />
 		<constructor-arg ref="agentFactory" />
-		<property name="pingCycle" value="0" />
+		<property name="pingCycle" value="${slc.server.services.pingCycle}" />
 	</bean>
 
 	<bean id="slcExecutionService"
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/services.properties b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/services.properties
new file mode 100644
index 000000000..a0167a887
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/services.properties
@@ -0,0 +1 @@
+slc.server.services.pingCycle=0
\ No newline at end of file
-- 
2.39.2