/*
 * Copyright 2016-2016 the original author or authors.
 *
 * 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 org.joinfaces.autoconfigure.richfaces;

import org.joinfaces.autoconfigure.javaxfaces.JavaxFacesAutoConfiguration;
import org.richfaces.application.CoreConfiguration;
import org.richfaces.webapp.ResourceServlet;

import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

/**
 * Spring Boot Auto Configuration of RichFaces.
 * @author Marcelo Fernandes
 * @author Jamillo Santos
 * @author Renato Soares
 */
@Configuration
@EnableConfigurationProperties(RichfacesProperties.class)
@ConditionalOnClass(CoreConfiguration.class)
@AutoConfigureBefore(JavaxFacesAutoConfiguration.class)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
public class RichfacesAutoConfiguration {

	@Bean
	public ServletRegistrationBean<ResourceServlet> richfacesResourcesServlet() {
		ServletRegistrationBean<ResourceServlet> result = new ServletRegistrationBean<>();
		result.setServlet(new ResourceServlet());
		result.setLoadOnStartup(1);
		result.addUrlMappings("/org.richfaces.resources/*");
		return result;
	}
}

@@ -730,32 +730,132 @@
 oConfiguration;%0A
+import org.joinfaces.autoconfigure.servlet.initializer.ServletContainerInitializerRegistrationBean;%0A
 import org.richf
@@ -918,31 +918,35 @@
 .webapp.
-ResourceServlet
+ServletsInitializer
 ;%0A%0Aimpor
@@ -1254,77 +1254,8 @@
 es;%0A
-import org.springframework.boot.web.servlet.ServletRegistrationBean;%0A
 impo
@@ -1821,301 +1821,184 @@
 vlet
-RegistrationBean%3CResourceServlet%3E richfacesResourcesServlet() %7B%0A%09%09ServletRegistrationBean%3CResourceServlet%3E result = new ServletRegistrationBean%3C%3E();%0A%09%09result.setServlet(new ResourceServlet());%0A%09%09result.setLoadOnStartup(1);%0A%09%09result.addUrlMappings(%22/org.richfaces.resources/*%22);%0A%09%09return result
+ContainerInitializerRegistrationBean%3CServletsInitializer%3E richfacesServletsInitializer() %7B%0A%09%09return new ServletContainerInitializerRegistrationBean%3C%3E(ServletsInitializer.class)
 ;%0A%09%7D

simplify Richfaces Configuration