zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix integration tests execution.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-11-04 01:06:02 -03:00
parent 45a190bbac
commit 52ce817e3a
11 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@@ -14,11 +14,9 @@
<context:component-scan base-package="com.wisemapping.ncontroller"/>
<context:annotation-config/>
<mvc:annotation-driven/>
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="/WEB-INF/app.properties"/>
</bean>
<context:property-placeholder
location="/WEB-INF/app.properties"
/>
<!-- Interceptors Registration -->
<mvc:interceptors>
@@ -114,8 +112,8 @@
</bean>
<beans profile="heroku">
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="/WEB-INF/heroku.properties" />
</bean>
<context:property-placeholder
location="/WEB-INF/heroku.properties"
/>
</beans>
</beans>