Subversion Repositories SmartDukaan

Rev

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

Rev 34635 Rev 34711
Line 134... Line 134...
134
		javaMailProperties.put("mail.debug", "true");// Prints out everything on screen
134
		javaMailProperties.put("mail.debug", "true");// Prints out everything on screen
135
		mailSender.setJavaMailProperties(javaMailProperties);
135
		mailSender.setJavaMailProperties(javaMailProperties);
136
		return mailSender;
136
		return mailSender;
137
	}*/
137
	}*/
138
 
138
 
139
	@Bean(name = "mailSender")
139
	/*@Bean(name = "mailSender")
140
	public JavaMailSender getSendgridMailSender() {
140
	public JavaMailSender getSendgridMailSender() {
141
		return googleMailSender();
141
		return googleMailSender();
142
	}
142
	}*/
143
 
143
 
144
	/*@Bean(name = "mailSender")
144
	@Bean(name = "mailSender")
145
	public JavaMailSender getSendgridMailSender() {
145
	public JavaMailSender getSendgridMailSender() {
146
		JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
146
		JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
147
 
147
 
148
		// Using gmail
148
		// Using gmail
149
		mailSender.setHost("smtp.sendgrid.net");
149
		mailSender.setHost("smtp.sendgrid.net");
150
		mailSender.setPort(587);
150
		mailSender.setPort(587);
151
		mailSender.setUsername("apikey");
151
		mailSender.setUsername("apikey");
152
		mailSender.setPassword("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");
152
		mailSender.setPassword("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");
153
 
153
 
154
		Properties javaMailProperties = new Properties();
154
		Properties javaMailProperties = new Properties();
155
		javaMailProperties.put("mail.smtp.starttls.enable", "false");
155
		javaMailProperties.put("mail.smtp.starttls.enable", "false");
156
		javaMailProperties.put("mail.smtp.auth", "true");
156
		javaMailProperties.put("mail.smtp.auth", "true");
157
		javaMailProperties.put("mail.transport.protocol", "smtp");
157
		javaMailProperties.put("mail.transport.protocol", "smtp");
158
		javaMailProperties.put("mail.debug", "true");// Prints out everything on screen
158
		javaMailProperties.put("mail.debug", "true");// Prints out everything on screen
159
 
159
 
160
		mailSender.setJavaMailProperties(javaMailProperties);
160
		mailSender.setJavaMailProperties(javaMailProperties);
161
		return mailSender;
161
		return mailSender;
162
	}*/
162
	}
163
 
163
 
164
	@Bean(name = "gson")
164
	@Bean(name = "gson")
165
	public Gson gson() {
165
	public Gson gson() {
166
 
166
 
167
		Gson gson = new GsonBuilder().setPrettyPrinting().serializeNulls()
167
		Gson gson = new GsonBuilder().setPrettyPrinting().serializeNulls()