Subversion Repositories SmartDukaan

Rev

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

Rev 32978 Rev 34634
Line 117... Line 117...
117 
		return mailSender;
 117 
		return mailSender;
118 
	}
 118 
	}
119 
 
 119 
 
120 
	@Bean(name = "mailSender")
 120 
	@Bean(name = "mailSender")
121 
	public JavaMailSender getSendgridMailSender() {
 121 
	public JavaMailSender getSendgridMailSender() {
- 
 
 122 
		return googleMailSender();
- 
 
 123 
	}
- 
 
 124 
 
- 
 
 125 
	/*@Bean(name = "mailSender")
- 
 
 126 
	public JavaMailSender getSendgridMailSender() {
122 
		JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
 127 
		JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
123 
 
 128 
 
124 
		// Using gmail
 129 
		// Using gmail
125 
		mailSender.setHost("smtp.sendgrid.net");
 130 
		mailSender.setHost("smtp.sendgrid.net");
126 
		mailSender.setPort(587);
 131 
		mailSender.setPort(587);
Line 133... Line 138...
133 
		javaMailProperties.put("mail.transport.protocol", "smtp");
 138 
		javaMailProperties.put("mail.transport.protocol", "smtp");
134 
		javaMailProperties.put("mail.debug", "true");// Prints out everything on screen
 139 
		javaMailProperties.put("mail.debug", "true");// Prints out everything on screen
135 
 
 140 
 
136 
		mailSender.setJavaMailProperties(javaMailProperties);
 141 
		mailSender.setJavaMailProperties(javaMailProperties);
137 
		return mailSender;
 142 
		return mailSender;
138 
	}
 143 
	}*/
139 
 
 144 
 
140 
	@Bean(name = "gson")
 145 
	@Bean(name = "gson")
141 
	public Gson gson() {
 146 
	public Gson gson() {
142 
 
 147 
 
143 
		Gson gson = new GsonBuilder().setPrettyPrinting().serializeNulls()
 148 
		Gson gson = new GsonBuilder().setPrettyPrinting().serializeNulls()