From 8b26602b42d71d4a0491297b8ffbf596979a90c9 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 22 Aug 2012 13:55:01 +0000
Subject: [PATCH] SP-245, BIS-150: Minimal application context for
bootstraping.
SVN: 26422
---
.../standard-technologies-applicationContext.xml | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml b/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml
index 524257a1379..bb2803b685a 100644
--- a/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml
+++ b/openbis_standard_technologies/source/java/standard-technologies-applicationContext.xml
@@ -11,8 +11,16 @@
http://www.springframework.org/schema/context/spring-context-2.5.xsd
">
- <import resource="genericCommonContext.xml"/>
- <import resource="genericApplicationContext.xml"/>
+ <!--
+ // Replaces ${...} with corresponding values found in 'location' property. A value
+ // can be overridden by setting a corresponding system property.
+ -->
+ <bean id="propertyConfigurer"
+ class="ch.systemsx.cisd.common.spring.ExposablePropertyPlaceholderConfigurer">
+ <property name="location" value="classpath:service.properties" />
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+ <property name="ignoreUnresolvablePlaceholders" value="true" />
+ </bean>
<bean name="bootstrap" class="ch.systemsx.cisd.common.spring.Bootstrapper">
<property name="configLocation" value="classpath:applicationContext.xml" />
@@ -23,8 +31,4 @@
</list>
</property>
</bean>
-
- <plugins:component-scan base-package="ch.systemsx.cisd.openbis" annotation-config="false">
- <plugins:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller" />
- </plugins:component-scan>
</beans>
\ No newline at end of file
--
GitLab