/*
 * Copyright 2016-2019 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.tobago;

import org.apache.myfaces.tobago.webapp.SecretSessionListener;
import org.apache.myfaces.tobago.webapp.TobagoServletContextListener;

import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.servlet.ServletContextInitializer;
import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

/**
 * {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration Auto configuration}
 * for Apache MyFaces Tobago.
 *
 * @author Lars Grefer
 */
@Configuration
@ConditionalOnClass(TobagoServletContextListener.class)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
public class TobagoAutoConfiguration {

	/**
	 * This {@link WebServerFactoryCustomizer} adds a {@link ServletContextInitializer} to the embedded servlet-container
	 * which is equivalent to tobagos's own {@code META-INF/web-fragment.xml}.
	 *
	 * @return tobago web server factory customizer
	 */
	@Bean
	public WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> tobagoWebServerFactoryCustomizer() {
		return factory -> factory.addInitializers(servletContext -> {
			servletContext.addListener(new TobagoServletContextListener());
			servletContext.addListener(new SecretSessionListener());
		});
	}
}

@@ -792,16 +792,88 @@
 istener;
+%0Aimport org.joinfaces.autoconfigure.servlet.WebFragmentRegistrationBean;
 %0A%0Aimport
@@ -1031,238 +1031,8 @@
 on;%0A
-import org.springframework.boot.web.server.WebServerFactoryCustomizer;%0Aimport org.springframework.boot.web.servlet.ServletContextInitializer;%0Aimport org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;%0A
 impo
@@ -1515,117 +1515,33 @@
  Web
-ServerFactoryCustomizer%7D adds a %7B@link ServletContextInitializer%7D to the embedded servlet-container%0A%09 * which
+FragmentRegistrationBean%7D
  is 
@@ -1559,20 +1559,14 @@
 to t
-obagos's own
+he%0A%09 *
  %7B@c
@@ -1599,379 +1599,381 @@
 xml%7D
-.%0A%09 *%0A%09 * @return tobago web server factory customizer%0A%09 */%0A%09@Bean%0A%09public WebServerFactoryCustomizer%3CConfigurableServletWebServerFactory%3E tobagoWebServerFactoryCustomizer() %7B%0A%09%09return factory -%3E factory.addInitializers(servletContext -%3E %7B%0A%09%09%09servletContext.addListener(new TobagoServletContextListener());%0A%09%09%09servletContext.addListener(new SecretSessionListener());%0A%09%09%7D)
+ of the %7B@code tobago-core.jar%7D.%0A%09 *%0A%09 * @return tobagoWebFragmentRegistrationBean%0A%09 */%0A%09@Bean%0A%09public WebFragmentRegistrationBean tobagoWebFragmentRegistrationBean() %7B%0A%09%09WebFragmentRegistrationBean bean = new WebFragmentRegistrationBean();%0A%09%09bean.getListeners().add(TobagoServletContextListener.class);%0A%09%09bean.getListeners().add(SecretSessionListener.class);%0A%09%09return bean
 ;%0A%09%7D

Migrate the Tobago config to use WebFragmentRegistrationBean