Skip to content

Commit 64927c7

Browse files
committed
Properties file configured also based on Maven profiles
1 parent 12e6b5b commit 64927c7

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

eva-server/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@
8080
</configuration>
8181
</plugin>
8282
</plugins>
83+
84+
<resources>
85+
<resource>
86+
<directory>src/main/resources</directory>
87+
<filtering>true</filtering>
88+
</resource>
89+
</resources>
8390
</build>
8491

8592
</project>
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
eva.mongo.host=
2-
eva.mongo.user=
3-
eva.mongo.passwd=
4-
eva.mongo.auth.db=
1+
eva.mongo.host=${eva.mongo.host}
2+
eva.mongo.user=${eva.mongo.user}
3+
eva.mongo.passwd=${eva.mongo.passwd}
4+
eva.mongo.auth.db=${eva.mongo.auth.db}
55

6-
eva.mongo.collections.variants=
7-
eva.mongo.collections.files=
6+
eva.mongo.collections.variants=${eva.mongo.collections.variants}
7+
eva.mongo.collections.files=${eva.mongo.collections.files}
88

9-
eva.version=
9+
eva.version=${eva.version}
1010

11-
eva.evapro.datasource=dstest
11+
eva.evapro.datasource=${eva.evapro.datasource}
1212

eva-server/src/main/webapp/WEB-INF/web.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<resource-ref>
5454
<description>EVAPRO Data Source</description>
55-
<res-ref-name>${eva.evapro.datasource}</res-ref-name>
55+
<res-ref-name>jdbc/${eva.evapro.datasource}</res-ref-name>
5656
<res-type>javax.sql.DataSource</res-type>
5757
<res-auth>Container</res-auth>
5858
</resource-ref>

0 commit comments

Comments
 (0)