Subversion Repositories SmartDukaan

Rev

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

Rev 31511 Rev 31512
Line 25... Line 25...
25 
import org.springframework.mail.javamail.JavaMailSenderImpl;
 25 
import org.springframework.mail.javamail.JavaMailSenderImpl;
26 
import org.springframework.ui.velocity.VelocityEngineFactoryBean;
 26 
import org.springframework.ui.velocity.VelocityEngineFactoryBean;
27 
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 27 
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
28 
import org.springframework.web.servlet.ViewResolver;
 28 
import org.springframework.web.servlet.ViewResolver;
29 
import org.springframework.web.servlet.view.BeanNameViewResolver;
 29 
import org.springframework.web.servlet.view.BeanNameViewResolver;
30 
import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
 - 
 
31 
import org.springframework.web.servlet.view.velocity.VelocityConfigurer;
 30 
import org.springframework.web.servlet.view.velocity.VelocityConfigurer;
32 
 
 31 
 
33 
import java.io.IOException;
 32 
import java.io.IOException;
34 
import java.math.RoundingMode;
 33 
import java.math.RoundingMode;
35 
import java.text.DecimalFormat;
 34 
import java.text.DecimalFormat;
Line 99... Line 98...
99 
		//attributesMap.put("esc", new EscapeTool());
 98 
		//attributesMap.put("esc", new EscapeTool());
100 
		attributesMap.put("ru", RoundingMode.HALF_UP);
 99 
		attributesMap.put("ru", RoundingMode.HALF_UP);
101 
		return attributesMap;
 100 
		return attributesMap;
102 
	}
 101 
	}
103 
 
 102 
 
104 
//	@Bean
 - 
 
105 
//	public ViewResolver viewResolver() {
 - 
 
106 
//		VelocityLayoutViewResolver bean = new VelocityLayoutViewResolver();
 - 
 
107 
//		bean.setPrefix("");
 - 
 
108 
//		bean.setSuffix(VELOCITY_PATH_SUFFIX);
 - 
 
109 
//		bean.setRequestContextAttribute("rc");
 - 
 
110 
//		bean.setAttributesMap(this.velocityAttributesMap());
 - 
 
111 
//		return bean;
 - 
 
112 
//	}
 - 
 
113 
 
 - 
 
114 
	@Bean
 103 
	@Bean
115 
	public ViewResolver viewResolver() {
 104 
	public ViewResolver viewResolver() {
116 
		FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
 105 
		VelocityLayoutViewResolver bean = new VelocityLayoutViewResolver();
117 
		resolver.setCache(true);
 106 
		bean.setPrefix("");
118 
		resolver.setPrefix("");
 107 
		bean.setSuffix(VELOCITY_PATH_SUFFIX);
119 
		resolver.setSuffix(".ftl");
 108 
		bean.setRequestContextAttribute("rc");
- 
 
 109 
		bean.setAttributesMap(this.velocityAttributesMap());
120 
		return resolver;
 110 
		return bean;
121 
	}
 111 
	}
122 
 
 112 
 
- 
 
 113 
//	@Bean
- 
 
 114 
//	public ViewResolver freemarkerViewResolver() {
- 
 
 115 
//		FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
- 
 
 116 
//		resolver.setCache(true);
- 
 
 117 
//		resolver.setPrefix("");
- 
 
 118 
//		resolver.setSuffix(".ftl");
- 
 
 119 
//		return resolver;
- 
 
 120 
//	}
- 
 
 121 
 
123 
	@Bean
 122 
	@Bean
124 
	public ViewResolver beanNameViewResolver() {
 123 
	public ViewResolver beanNameViewResolver() {
125 
		BeanNameViewResolver resolver = new BeanNameViewResolver();
 124 
		BeanNameViewResolver resolver = new BeanNameViewResolver();
126 
		return resolver;
 125 
		return resolver;
127 
	}
 126 
	}