diff --git a/spring-faces/src/main/java/org/springframework/faces/config/AbstractFacesFlowConfiguration.java b/spring-faces/src/main/java/org/springframework/faces/config/AbstractFacesFlowConfiguration.java index 29df0985..8adcb89e 100644 --- a/spring-faces/src/main/java/org/springframework/faces/config/AbstractFacesFlowConfiguration.java +++ b/spring-faces/src/main/java/org/springframework/faces/config/AbstractFacesFlowConfiguration.java @@ -23,7 +23,6 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.faces.webflow.JsfResourceRequestHandler; -import org.springframework.util.ClassUtils; import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter; import org.springframework.webflow.config.FlowDefinitionRegistryBuilder; @@ -53,11 +52,6 @@ import org.springframework.webflow.executor.FlowExecutor; */ public class AbstractFacesFlowConfiguration implements ApplicationContextAware { - private static final boolean isRichFacesPresent = - ClassUtils.isPresent("org.richfaces.application.CoreConfiguration", - ResourcesBeanDefinitionParser.class.getClassLoader()); - - private ApplicationContext applicationContext; @@ -108,9 +102,6 @@ public class AbstractFacesFlowConfiguration implements ApplicationContextAware { Map urlMap = new HashMap<>(); urlMap.put("/jakarta.faces.resource/**", jsfResourceRequestHandler()); - if (isRichFacesPresent) { - urlMap.put("/rfRes/**", jsfResourceRequestHandler()); - } SimpleUrlHandlerMapping handlerMapping = new SimpleUrlHandlerMapping(); handlerMapping.setUrlMap(urlMap); diff --git a/spring-faces/src/main/java/org/springframework/faces/config/ResourcesBeanDefinitionParser.java b/spring-faces/src/main/java/org/springframework/faces/config/ResourcesBeanDefinitionParser.java index 5245bab0..1e4efe9e 100644 --- a/spring-faces/src/main/java/org/springframework/faces/config/ResourcesBeanDefinitionParser.java +++ b/spring-faces/src/main/java/org/springframework/faces/config/ResourcesBeanDefinitionParser.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.support.ManagedMap; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; import org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter; @@ -41,10 +40,6 @@ public class ResourcesBeanDefinitionParser implements BeanDefinitionParser { private static final String SERVLET_RESOURCE_HANDLER_BEAN_NAME = "jsfResourceRequestHandler"; - private static final boolean isRichFacesPresent = - ClassUtils.isPresent("org.richfaces.application.CoreConfiguration", - ResourcesBeanDefinitionParser.class.getClassLoader()); - public BeanDefinition parse(Element element, ParserContext parserContext) { Object source = parserContext.extractSource(element); @@ -78,10 +73,6 @@ public class ResourcesBeanDefinitionParser implements BeanDefinitionParser { Map urlMap = new ManagedMap<>(); urlMap.put("/jakarta.faces.resource/**", SERVLET_RESOURCE_HANDLER_BEAN_NAME); - if (isRichFacesPresent) { - urlMap.put("/rfRes/**", SERVLET_RESOURCE_HANDLER_BEAN_NAME); - } - RootBeanDefinition beanDefinition = new RootBeanDefinition(SimpleUrlHandlerMapping.class); beanDefinition.setSource(source); beanDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);