Commit 8c1da1ea authored by Matija Obreza's avatar Matija Obreza
Browse files

Load preferences from classpath:/genesys.properties

parent 6d2b0c19
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<aop:aspectj-autoproxy /> <aop:aspectj-autoproxy />
<context:property-placeholder location="classpath:/application.properties,classpath:/spring/spring.properties"/> <context:property-placeholder ignore-resource-not-found="true" location="classpath:/application.properties,classpath:/spring/spring.properties,classpath:/genesys.properties"/>
<context:component-scan base-package="org.crophub.rest.common"> <context:component-scan base-package="org.crophub.rest.common">
<!--Include @Entity for scanning of Acl Classes purposes--> <!--Include @Entity for scanning of Acl Classes purposes-->
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
<context:property-placeholder location="classpath:/application.properties,classpath:/spring/spring.properties"/> <context:property-placeholder ignore-resource-not-found="true" location="classpath:/application.properties,classpath:/spring/spring.properties,classpath:/genesys.properties"/>
<bean name="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> <bean name="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="url" value="${db.url}"/> <property name="url" value="${db.url}"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment