diff --git a/jawr-spring/jawr-spring-extension/src/main/java/net/jawr/web/autoconfigure/JawrAutoConfiguration.java b/jawr-spring/jawr-spring-extension/src/main/java/net/jawr/web/autoconfigure/JawrAutoConfiguration.java index 83c3d0bb..cc0c8e78 100644 --- a/jawr-spring/jawr-spring-extension/src/main/java/net/jawr/web/autoconfigure/JawrAutoConfiguration.java +++ b/jawr-spring/jawr-spring-extension/src/main/java/net/jawr/web/autoconfigure/JawrAutoConfiguration.java @@ -109,6 +109,10 @@ public JawrSpringController jawrJsController() { @Configuration @ConditionalOnMissingBean(name = "jawrHandlerMapping") public static class jawrHandlerMappingConfiguration { + + @Autowired + private Properties jawrProperties; + @Autowired private JawrSpringController jawrJsController; @@ -121,7 +125,7 @@ public static class jawrHandlerMappingConfiguration { @Bean public HandlerMapping jawrHandlerMapping() { SimpleUrlHandlerMapping handlerMapping = new SimpleUrlHandlerMapping(); - handlerMapping.setOrder(Ordered.HIGHEST_PRECEDENCE); + handlerMapping.setOrder(Integer.valueOf(jawrProperties.getProperty("jawr.handler.mapping.order", String.valueOf(Ordered.LOWEST_PRECEDENCE - 2)))); Map urlMap = new HashMap(); urlMap.put("**/*.css", jawrCssController);