Subversion Repositories SmartDukaan

Rev

Rev 34582 | Rev 34636 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34582 Rev 34633
Line 22... Line 22...
22
import org.apache.velocity.app.VelocityEngine;
22
import org.apache.velocity.app.VelocityEngine;
23
import org.apache.velocity.exception.VelocityException;
23
import org.apache.velocity.exception.VelocityException;
24
import org.springframework.context.annotation.Bean;
24
import org.springframework.context.annotation.Bean;
25
import org.springframework.context.annotation.ComponentScan;
25
import org.springframework.context.annotation.ComponentScan;
26
import org.springframework.context.annotation.Configuration;
26
import org.springframework.context.annotation.Configuration;
-
 
27
import org.springframework.context.annotation.Primary;
27
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
28
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
28
import org.springframework.context.support.ReloadableResourceBundleMessageSource;
29
import org.springframework.context.support.ReloadableResourceBundleMessageSource;
29
import org.springframework.core.io.ClassPathResource;
30
import org.springframework.core.io.ClassPathResource;
30
import org.springframework.core.io.Resource;
31
import org.springframework.core.io.Resource;
31
import org.springframework.mail.javamail.JavaMailSender;
32
import org.springframework.mail.javamail.JavaMailSender;
Line 192... Line 193...
192
        }
193
        }
193
        LOGGER.info("Profile is [{}]", properties.get("profile"));
194
        LOGGER.info("Profile is [{}]", properties.get("profile"));
194
        return (String) properties.get("profile");
195
        return (String) properties.get("profile");
195
    }
196
    }
196
 
197
 
197
    @Bean(name = "mailSender")
198
    /*@Bean(name = "mailSender")
198
    public JavaMailSender getSendgridMailSender() {
199
    public JavaMailSender getSendgridMailSender() {
199
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
200
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
200
 
201
 
201
        // Using gmail
202
        // Using gmail
202
        mailSender.setHost("smtp.sendgrid.net");
203
        mailSender.setHost("smtp.sendgrid.net");
Line 211... Line 212...
211
        javaMailProperties.put("mail.debug", "true");// Prints out everything on
212
        javaMailProperties.put("mail.debug", "true");// Prints out everything on
212
        // screen
213
        // screen
213
 
214
 
214
        mailSender.setJavaMailProperties(javaMailProperties);
215
        mailSender.setJavaMailProperties(javaMailProperties);
215
        return mailSender;
216
        return mailSender;
-
 
217
    }*/
-
 
218
 
-
 
219
    @Bean(name = "mailSender")
-
 
220
    @Primary
-
 
221
    public JavaMailSender getSendgridMailSender() {
-
 
222
        return googleMailSender();
216
    }
223
    }
217
 
224
 
218
    @Bean
225
    @Bean
219
    public JavaMailSender googleMailSender() {
226
    public JavaMailSender googleMailSender() {
220
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
227
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();