Merge with igoshin

src/main/java/org/genesys2/server/service/impl/EMailServiceImpl.java

@@ -16,10 +16,6 @@
 
 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;
@@ -31,6 +27,9 @@ 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 {
 

src/main/java/org/genesys2/spring/config/ApplicationConfig.java

 /**
  * Copyright 2014 Global Crop Diversity Trust
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/main/resources/spring/spring.properties

@@ -21,11 +21,11 @@ base.cookie-domain=
 base.cookie-secure=false
 base.cookie-http-only=false
 
-db.url=jdbc:mysql://localhost/genesyslive?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
+db.url=jdbc:mysql://localhost/genesys4?useUnicode=true&characterEncoding=UTF-8&useFastDateParsing=false
 db.driverClassName=com.mysql.jdbc.Driver
 db.dialect=org.hibernate.dialect.MySQL5Dialect
 db.username=root
-db.password=
+db.password=1
 db.showSql=false
 db.hbm2ddl=do-nothing
 

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

@@ -37,6 +37,12 @@
         <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>