Skip to content

Commit 6bd518b

Browse files
committed
Replaced dev profile with prod.
1 parent a9a0226 commit 6bd518b

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
<scope>runtime</scope>
346346
</dependency>
347347

348-
<!-- Dependencies which used only in dev environment -->
348+
<!-- Dependencies which used only in prod environment -->
349349
<dependency>
350350
<groupId>commons-dbcp</groupId>
351351
<artifactId>commons-dbcp</artifactId>
@@ -722,18 +722,18 @@
722722

723723
<!--
724724
There are 2 profiles:
725-
- dev (uses MySQL)
725+
- prod (uses MySQL)
726726
- test (enabled by default, uses H2)
727727
-->
728728
<profiles>
729729

730730
<profile>
731-
<id>dev</id>
731+
<id>prod</id>
732732
<activation>
733733
<activeByDefault>false</activeByDefault>
734734
</activation>
735735
<properties>
736-
<env.dir>${basedir}/src/main/resources/dev</env.dir>
736+
<env.dir>${basedir}/src/main/resources/prod</env.dir>
737737
</properties>
738738
</profile>
739739

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
@PropertySource("classpath:${spring.profiles.active}/spring/database.properties")
4545
@Import({
4646
TestDataSource.class,
47-
DevDataSource.class
47+
ProdDataSource.class
4848
})
4949
public class DbConfig {
5050

src/main/java/ru/mystamps/web/config/DevDataSource.java renamed to src/main/java/ru/mystamps/web/config/ProdDataSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import org.springframework.core.env.Environment;
3030

3131
@Configuration
32-
@Profile("dev")
33-
@PropertySource("classpath:dev/spring/database.properties")
34-
public class DevDataSource {
32+
@Profile("prod")
33+
@PropertySource("classpath:prod/spring/database.properties")
34+
public class ProdDataSource {
3535

3636
@Inject
3737
private Environment env;

src/main/resources/dev/log4j.properties renamed to src/main/resources/prod/log4j.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ log4j.additivity.org.springframework = false
99
log4j.additivity.org.hibernate = false
1010

1111
log4j.appender.root-log = org.apache.log4j.RollingFileAppender
12-
log4j.appender.root-log.File = /tmp/mystamps-root.log
12+
log4j.appender.root-log.File = /data/logs/mystamps-root.log
1313
log4j.appender.root-log.MaxBackupIndex = 1
1414
log4j.appender.root-log.MaxFileSize = 1MB
1515
log4j.appender.root-log.layout = org.apache.log4j.PatternLayout
1616
log4j.appender.root-log.layout.ConversionPattern = %d %5p - %m%n
1717

1818
log4j.appender.mystamps-log = org.apache.log4j.RollingFileAppender
19-
log4j.appender.mystamps-log.File = /tmp/mystamps.log
19+
log4j.appender.mystamps-log.File = /data/logs/mystamps.log
2020
log4j.appender.mystamps-log.MaxBackupIndex = 1
2121
log4j.appender.mystamps-log.MaxFileSize = 1MB
2222
log4j.appender.mystamps-log.layout = org.apache.log4j.PatternLayout
2323
log4j.appender.mystamps-log.layout.ConversionPattern = %d %5p %c{1}.%M:%L - %m%n
2424

2525
log4j.appender.spring-log = org.apache.log4j.RollingFileAppender
26-
log4j.appender.spring-log.File = /tmp/mystamps-spring.log
26+
log4j.appender.spring-log.File = /data/logs/mystamps-spring.log
2727
log4j.appender.spring-log.MaxBackupIndex = 1
2828
log4j.appender.spring-log.MaxFileSize = 1MB
2929
log4j.appender.spring-log.layout = org.apache.log4j.PatternLayout
3030
log4j.appender.spring-log.layout.ConversionPattern = %d %5p - %m%n
3131

3232
log4j.appender.hibernate-log = org.apache.log4j.RollingFileAppender
33-
log4j.appender.hibernate-log.File = /tmp/mystamps-hibernate.log
33+
log4j.appender.hibernate-log.File = /data/logs/mystamps-hibernate.log
3434
log4j.appender.hibernate-log.MaxBackupIndex = 1
3535
log4j.appender.hibernate-log.MaxFileSize = 1MB
3636
log4j.appender.hibernate-log.layout = org.apache.log4j.PatternLayout

src/main/resources/dev/spring/database.properties renamed to src/main/resources/prod/spring/database.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
db.driverClassName = com.mysql.jdbc.Driver
22
db.url = jdbc:mysql://localhost:3306/mystamps
33
db.username = mystamps
4-
db.password = mystamps
4+
db.password = q1
55
jpa.dialectClassName = ru.mystamps.web.support.hibernate.MySql5InnoDbDialect
66
jpa.showSql = false
77
hibernate.formatSql = true

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

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

1010
<context-param>
1111
<param-name>spring.profiles.active</param-name>
12-
<param-value>dev</param-value>
12+
<param-value>prod</param-value>
1313
</context-param>
1414

1515
<context-param>

0 commit comments

Comments
 (0)