Subversion Repositories SmartDukaan

Rev

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

Rev 32773 Rev 32787
Line 94... Line 94...
94
        attributesMap.put("dateMonthYearFormatter", dateMonthYearFormatter);
94
        attributesMap.put("dateMonthYearFormatter", dateMonthYearFormatter);
95
        attributesMap.put("dateMonthChYear", dateMonthChYear);
95
        attributesMap.put("dateMonthChYear", dateMonthChYear);
96
        attributesMap.put("decimalFormatter", decimalFormatter);
96
        attributesMap.put("decimalFormatter", decimalFormatter);
97
        attributesMap.put("noData", "<tr><td colspan=\"20\" style=\"text-align:center;\">No results found for the given criteria</td></tr>");
97
        attributesMap.put("noData", "<tr><td colspan=\"20\" style=\"text-align:center;\">No results found for the given criteria</td></tr>");
98
        attributesMap.put("dateTimeFormatter", dateTimeFormatter);
98
        attributesMap.put("dateTimeFormatter", dateTimeFormatter);
99
        attributesMap.put("version", "197");
99
        attributesMap.put("version", "198");
100
        attributesMap.put("cssVersion", "12");
100
        attributesMap.put("cssVersion", "12");
101
        attributesMap.put("isDev", getActiveProfile().equals("dev"));
101
        attributesMap.put("isDev", getActiveProfile().equals("dev"));
102
        attributesMap.put("vmUtils", new Utils());
102
        attributesMap.put("vmUtils", new Utils());
103
        //attributesMap.put("esc", new EscapeTool());
103
        //attributesMap.put("esc", new EscapeTool());
104
        attributesMap.put("ru", RoundingMode.HALF_UP);
104
        attributesMap.put("ru", RoundingMode.HALF_UP);
Line 134... Line 134...
134
    @Bean
134
    @Bean
135
    public VelocityConfigurer velocityConfig() {
135
    public VelocityConfigurer velocityConfig() {
136
        VelocityConfigurer velocityConfigurer = new VelocityConfigurer();
136
        VelocityConfigurer velocityConfigurer = new VelocityConfigurer();
137
        Properties velocityProperties = new Properties();
137
        Properties velocityProperties = new Properties();
138
        velocityProperties.put("directive.set.null.allowed", "true");
138
        velocityProperties.put("directive.set.null.allowed", "true");
-
 
139
        velocityProperties.put("file.resource.loader.cache", true);
-
 
140
        velocityProperties.put("file.resource.loader.unicode", true);
-
 
141
        velocityProperties.put("input.encoding", "UTF-8");
-
 
142
        velocityProperties.put("output.encoding", "UTF-8");
-
 
143
        velocityProperties.put("contentType", "text/html");
-
 
144
        velocityProperties.put("charset", "UTF-8");
-
 
145
        velocityProperties.put("response.encoding", "UTF-8");
139
        velocityConfigurer.setVelocityProperties(velocityProperties);
146
        velocityConfigurer.setVelocityProperties(velocityProperties);
140
        velocityConfigurer.setResourceLoaderPath(VELOCITY_PATH_PREFIX);
147
        velocityConfigurer.setResourceLoaderPath(VELOCITY_PATH_PREFIX);
141
        return velocityConfigurer;
148
        return velocityConfigurer;
142
    }
149
    }
143
 
150
 
144
    @Bean(name = "messageSource")
151
    @Bean
145
    public ReloadableResourceBundleMessageSource getReloadableResourceBundleMessageSource() {
152
    public ReloadableResourceBundleMessageSource messageSource() {
146
        LOGGER.debug("creating messageSource bean with message path source name : " + MESSAGE_PATH_SOURCE_NAME);
153
        LOGGER.debug("creating messageSource bean with message path source name : " + MESSAGE_PATH_SOURCE_NAME);
147
        ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
154
        ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
148
        messageSource.setBasename(MESSAGE_PATH_SOURCE_NAME);
155
        messageSource.setBasename(MESSAGE_PATH_SOURCE_NAME);
149
        messageSource.setDefaultEncoding("UTF-8");
156
        messageSource.setDefaultEncoding("UTF-8");
150
        //messageSource.setDefaultEncoding("ISO 8859-1");
157
        //messageSource.setDefaultEncoding("ISO 8859-1");