/*
 * Copyright (c) 2008-2016 Haulmont.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */

package com.haulmont.cuba.core.sys;

import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.web.context.support.StandardServletEnvironment;

import javax.servlet.ServletContext;

public class CubaClassPathXmlApplicationContext extends ClassPathXmlApplicationContext {
    ServletContext servletContext;

    public CubaClassPathXmlApplicationContext(String[] locations) {
        super(locations);
    }

    public CubaClassPathXmlApplicationContext(String[] locations, ServletContext sc) {
        super();
        servletContext = sc;
        setConfigLocations(locations);
        afterPropertiesSet();
    }

    @Override
    protected void initBeanDefinitionReader(XmlBeanDefinitionReader reader) {
        setValidating(false);
        super.initBeanDefinitionReader(reader);
    }

    @Override
    protected DefaultListableBeanFactory createBeanFactory() {
        return new CubaDefaultListableBeanFactory(getInternalParentBeanFactory());
    }

    @Override
    protected ConfigurableEnvironment createEnvironment() {
        StandardServletEnvironment standardServletEnvironment = new StandardServletEnvironment();
        standardServletEnvironment.initPropertySources(servletContext, null);
        return standardServletEnvironment;
    }
}
@@ -636,16 +636,97 @@
 e.sys;%0A%0A
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;%0A
 import o
@@ -1000,16 +1000,153 @@
 onment;%0A
+import org.springframework.web.context.ServletContextAware;%0Aimport org.springframework.web.context.support.ServletContextAwareProcessor;%0A
 import o
@@ -2328,10 +2328,352 @@
 t;%0A    %7D
+%0A%0A    @Override%0A    protected void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) %7B%0A        if (this.servletContext != null) %7B%0A            beanFactory.addBeanPostProcessor(new ServletContextAwareProcessor(this.servletContext));%0A            beanFactory.ignoreDependencyInterface(ServletContextAware.class);%0A        %7D%0A    %7D
 %0A%7D

Add ServletContext post processor to CubaClassPathXmlApplicationContext #2791