Revert "Add initial cut of expanded resource handling"

This reverts commit d4a0e62, reversing
changes made to 8abe949.

Author: rstoyanchev

build.gradle

@@ -22,7 +22,6 @@ configure(allprojects) { project ->
 	apply plugin: "java"
 	apply plugin: "test-source-set-dependencies"
 	apply from: "${gradleScriptDir}/ide.gradle"
-	apply plugin: "maven"
 
 	[compileJava, compileTestJava]*.options*.compilerArgs = [
 		"-Xlint:serial",
@@ -632,7 +631,6 @@ project("spring-webmvc") {
 		optional("org.freemarker:freemarker:2.3.19")
 		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
 		optional("com.fasterxml.jackson.core:jackson-databind:2.2.0")
-		optional("org.lesscss:lesscss:1.3.3")
 		provided("javax.servlet:jstl:1.2")
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		provided("javax.servlet.jsp:jsp-api:2.1")

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java

@@ -23,10 +23,7 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.servlet.resource.PathResourceResolver;
 import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
-import org.springframework.web.servlet.resource.ResourceResolver;
-import org.springframework.web.servlet.resource.ResourceTransformer;
 
 /**
  * Encapsulates information required to create a resource handlers.
@@ -46,11 +43,6 @@ public class ResourceHandlerRegistration {
 
 	private Integer cachePeriod;
 
-	private List<ResourceResolver> resourceResolvers;
-
-	private List<ResourceTransformer> resourceTransformers;
-
-
 	/**
 	 * Create a {@link ResourceHandlerRegistration} instance.
 	 * @param resourceLoader a resource loader for turning a String location into a {@link Resource}
@@ -78,23 +70,6 @@ public ResourceHandlerRegistration addResourceLocations(String...resourceLocatio
 		return this;
 	}
 
-	/**
-	 * Configure the list of {@link ResourceResolver}s to use.
-	 * <p>
-	 * By default {@link PathResourceResolver} is configured. If using this property, it
-	 * is recommended to add {@link PathResourceResolver} as the last resolver.
-	 */
-	public void setResourceResolvers(List<ResourceResolver> resourceResolvers) {
-		this.resourceResolvers = resourceResolvers;
-	}
-
-	/**
-	 * Configure the list of {@link ResourceTransformer}s to use.
-	 */
-	public void setResourceTransformers(List<ResourceTransformer> transformers) {
-		this.resourceTransformers = transformers;
-	}
-
 	/**
 	 * Specify the cache period for the resources served by the resource handler, in seconds. The default is to not
 	 * send any cache headers but to rely on last-modified timestamps only. Set to 0 in order to send cache headers
@@ -120,15 +95,9 @@ protected String[] getPathPatterns() {
 	protected ResourceHttpRequestHandler getRequestHandler() {
 		Assert.isTrue(!CollectionUtils.isEmpty(locations), "At least one location is required for resource handling.");
 		ResourceHttpRequestHandler requestHandler = new ResourceHttpRequestHandler();
-		if (this.resourceResolvers != null) {
-			requestHandler.setResourceResolvers(this.resourceResolvers);
-		}
-		if (this.resourceTransformers != null) {
-			requestHandler.setResourceTransformers(this.resourceTransformers);
-		}
-		requestHandler.setLocations(this.locations);
-		if (this.cachePeriod != null) {
-			requestHandler.setCacheSeconds(this.cachePeriod);
+		requestHandler.setLocations(locations);
+		if (cachePeriod != null) {
+			requestHandler.setCacheSeconds(cachePeriod);
 		}
 		return requestHandler;
 	}

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java

@@ -23,7 +23,6 @@
 
 import javax.servlet.ServletContext;
 
-import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.Assert;
 import org.springframework.web.HttpRequestHandler;
@@ -99,12 +98,6 @@ protected AbstractHandlerMapping getHandlerMapping() {
 				ResourceHttpRequestHandler requestHandler = registration.getRequestHandler();
 				requestHandler.setServletContext(servletContext);
 				requestHandler.setApplicationContext(applicationContext);
-				try {
-					requestHandler.afterPropertiesSet();
-				}
-				catch (Exception e) {
-					throw new BeanInitializationException("Failed to init ResourceHttpRequestHandler", e);
-				}
 				urlMap.put(pathPattern, requestHandler);
 			}
 		}