Refactor to work with Spring 4.0

Refactor code to work with Spring 4.0 M1
This commit is contained in:
Phillip Webb
2013-05-08 14:34:08 -07:00
parent a8d6b435a4
commit a0fb085102
16 changed files with 114 additions and 19 deletions

View File

@@ -44,7 +44,6 @@ import org.springframework.http.client.ClientHttpResponse;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.StreamUtils;
import org.springframework.web.ServletContextInitializer;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;

View File

@@ -37,7 +37,6 @@ import org.springframework.context.ApplicationContextException;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.Ordered;
import org.springframework.web.ServletContextInitializer;
import org.springframework.web.context.ServletContextAware;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.request.SessionScope;

View File

@@ -38,7 +38,6 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.web.ServletContextInitializer;
/**
* Mock {@link EmbeddedServletContainerFactory}.