Commit d66656b8 authored by Matija Obreza's avatar Matija Obreza

Undo differences in igoshin

parent 44e11ecd
......@@ -16,6 +16,10 @@
package org.genesys2.server.service.impl;
import java.util.Arrays;
import javax.mail.internet.MimeMessage;
import org.genesys2.server.service.EMailService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -27,9 +31,6 @@ import org.springframework.mail.javamail.MimeMessagePreparator;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import javax.mail.internet.MimeMessage;
import java.util.Arrays;
@Service
public class EMailServiceImpl implements EMailService {
......
......@@ -21,11 +21,11 @@ base.cookie-domain=
base.cookie-secure=false
base.cookie-http-only=false
db.url=jdbc:mysql://localhost/genesys4?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
db.url=jdbc:mysql://localhost/genesyslive?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
db.driverClassName=com.mysql.jdbc.Driver
db.dialect=org.hibernate.dialect.MySQL5Dialect
db.username=root
db.password=1
db.password=
db.showSql=false
db.hbm2ddl=do-nothing
......
......@@ -37,12 +37,6 @@
<param-value>org.genesys2.spring.config.ApplicationConfig</param-value>
</context-param>
<context-param>
<param-name>spring.profiles.active</param-name>
<param-value>dev</param-value>
</context-param>
<listener>
<listener-class>com.hazelcast.web.SessionListener</listener-class>
</listener>
......
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