Skip to content

Commit 5e5afdb

Browse files
committed
Unbreak application under dev profile.
@propertysource don't substitute values from property file, so replace it to using @ImportResource with <context:property-placeholder /> Looks like I broke it in 876801d commit when migrated to Java configs. Don't fully understand why it worked under test profile.
1 parent 4e351c5 commit 5e5afdb

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

src/main/java/ru/mystamps/web/config/DbConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.springframework.beans.factory.annotation.Value;
2828
import org.springframework.context.annotation.Bean;
2929
import org.springframework.context.annotation.Configuration;
30-
import org.springframework.context.annotation.PropertySource;
30+
import org.springframework.context.annotation.ImportResource;
3131
import org.springframework.orm.jpa.JpaTransactionManager;
3232
import org.springframework.orm.jpa.JpaVendorAdapter;
3333
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
@@ -37,7 +37,7 @@
3737

3838
@Configuration
3939
@EnableTransactionManagement
40-
@PropertySource("classpath:spring/database.properties")
40+
@ImportResource("classpath:spring/database.xml")
4141
public class DbConfig {
4242

4343
@Value("${jpa.showSql}")

src/main/java/ru/mystamps/web/config/DevDataSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import org.springframework.beans.factory.annotation.Value;
2626
import org.springframework.context.annotation.Bean;
2727
import org.springframework.context.annotation.Configuration;
28+
import org.springframework.context.annotation.ImportResource;
2829
import org.springframework.context.annotation.Profile;
29-
import org.springframework.context.annotation.PropertySource;
3030

3131
@Configuration
3232
@Profile("dev")
33-
@PropertySource("classpath:spring/database.properties")
33+
@ImportResource("classpath:spring/database.xml")
3434
public class DevDataSource {
3535

3636
@Value("${db.driverClassName}")
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<beans xmlns="http://www.springframework.org/schema/beans"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns:context="http://www.springframework.org/schema/context"
4+
xsi:schemaLocation="http://www.springframework.org/schema/beans
5+
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
6+
http://www.springframework.org/schema/context
7+
http://www.springframework.org/schema/context/spring-context-3.1.xsd">
8+
9+
<context:property-placeholder location="classpath:spring/database.properties" />
10+
11+
</beans>

0 commit comments

Comments
 (0)