Shorten package name for Spring MVC Test framework

spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/JsonPathExpectationsHelper.java → spring-test-mvc/src/main/java/org/springframework/test/util/JsonPathExpectationsHelper.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.support;
+package org.springframework.test.util;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.text.ParseException;
 import java.util.List;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/XmlExpectationsHelper.java → spring-test-mvc/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.support;
+package org.springframework.test.util;
 
 import java.io.StringReader;
 import java.util.Map;
@@ -28,8 +28,8 @@ import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
-import org.springframework.test.web.mock.AssertionErrors;
-import org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.util.AssertionErrors;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/XpathExpectationsHelper.java → spring-test-mvc/src/main/java/org/springframework/test/util/XpathExpectationsHelper.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.support;
+package org.springframework.test.util;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
 
 import java.io.StringReader;
 import java.util.Collections;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/MockRestServiceServer.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -24,8 +24,8 @@ import java.util.List;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.test.web.mock.client.match.MockRestRequestMatchers;
-import org.springframework.test.web.mock.client.response.MockRestResponseCreators;
+import org.springframework.test.web.client.match.MockRestRequestMatchers;
+import org.springframework.test.web.client.response.MockRestResponseCreators;
 import org.springframework.util.Assert;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.support.RestGatewaySupport;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/RequestMatcher.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcher.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/RequestMatcherClientHttpRequest.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 import java.util.LinkedList;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/ResponseActions.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseActions.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 /**
  * A contract for setting up request expectations and defining a response.

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/ResponseCreator.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/ResponseCreator.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import java.io.IOException;
 
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.test.web.mock.client.response.MockRestResponseCreators;
+import org.springframework.test.web.client.response.MockRestResponseCreators;
 
 /**
  * A contract for creating a {@link ClientHttpResponse}.

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/ContentRequestMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/match/ContentRequestMatchers.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.io.IOException;
 
@@ -29,8 +29,8 @@ import org.hamcrest.Matchers;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.RequestMatcher;
-import org.springframework.test.web.mock.support.XmlExpectationsHelper;
+import org.springframework.test.util.XmlExpectationsHelper;
+import org.springframework.test.web.client.RequestMatcher;
 import org.w3c.dom.Node;
 
 /**

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/JsonPathRequestMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/match/JsonPathRequestMatchers.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -25,8 +25,8 @@ import java.util.List;
 import org.hamcrest.Matcher;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.RequestMatcher;
-import org.springframework.test.web.mock.support.JsonPathExpectationsHelper;
+import org.springframework.test.util.JsonPathExpectationsHelper;
+import org.springframework.test.web.client.RequestMatcher;
 
 /**
  * Factory methods for request content {@code RequestMatcher}'s using a <a

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/MockRestRequestMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 import java.net.URI;
@@ -30,9 +30,9 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.AssertionErrors;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
-import org.springframework.test.web.mock.client.RequestMatcher;
+import org.springframework.test.util.AssertionErrors;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.test.web.client.RequestMatcher;
 import org.springframework.util.Assert;
 
 /**

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/XpathRequestMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/match/XpathRequestMatchers.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 import java.util.Map;
@@ -24,8 +24,8 @@ import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.RequestMatcher;
-import org.springframework.test.web.mock.support.XpathExpectationsHelper;
+import org.springframework.test.util.XpathExpectationsHelper;
+import org.springframework.test.web.client.RequestMatcher;
 import org.w3c.dom.Node;
 
 /**

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/match/package-info.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/match/package-info.java

@@ -15,9 +15,9 @@
  */
 
 /**
- * Contains built-in {@link org.springframework.test.web.mock.client.RequestMatcher}
+ * Contains built-in {@link org.springframework.test.web.client.RequestMatcher}
  * implementations. Use
- * {@link org.springframework.test.web.mock.client.match.MockRestRequestMatchers}
+ * {@link org.springframework.test.web.client.match.MockRestRequestMatchers}
  * to gain access to instances of those implementations.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/package-info.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/package-info.java

@@ -16,6 +16,6 @@
 
 /**
  * Contains client-side REST testing support.
- * @see org.springframework.test.web.mock.client.MockRestServiceServer
+ * @see org.springframework.test.web.client.MockRestServiceServer
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/DefaultResponseCreator.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/response/DefaultResponseCreator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.response;
+package org.springframework.test.web.client.response;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,7 +27,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.mock.http.client.MockClientHttpResponse;
-import org.springframework.test.web.mock.client.ResponseCreator;
+import org.springframework.test.web.client.ResponseCreator;
 import org.springframework.util.Assert;
 
 /**

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/MockRestResponseCreators.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.response;
+package org.springframework.test.web.client.response;
 
 import java.io.IOException;
 import java.net.URI;
@@ -24,7 +24,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.mock.http.client.MockClientHttpResponse;
-import org.springframework.test.web.mock.client.ResponseCreator;
+import org.springframework.test.web.client.ResponseCreator;
 
 /**
  * Static factory methods for obtaining a {@link ResponseCreator} instance.

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/package-info.java → spring-test-mvc/src/main/java/org/springframework/test/web/client/response/package-info.java

@@ -15,9 +15,9 @@
  */
 
 /**
- * Contains built-in {@link org.springframework.test.web.mock.servlet.RequestBuilder}
+ * Contains built-in {@link org.springframework.test.web.client.ResponseCreator}
  * implementations. Use
- * {@link org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders}
+ * {@link org.springframework.test.web.client.response.MockRestResponseCreators}
  * to gain access to instances of those implementations.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.client.response;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/support/package-info.java

-/*
- * Copyright 2002-2012 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.
- */
-
-/**
- * Support classes shared among client and server-side Spring MVC Test classes.
- */
-package org.springframework.test.web.mock.support;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/DefaultMvcResult.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/DefaultMvcResult.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvc.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvc.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,7 +67,7 @@ public final class MockMvc {
 
 	/**
 	 * Private constructor, not for direct instantiation.
-	 * @see org.springframework.test.web.mock.servlet.setup.MockMvcBuilders
+	 * @see org.springframework.test.web.servlet.setup.MockMvcBuilders
 	 */
 	MockMvc(MockFilterChain filterChain, ServletContext servletContext) {
 		Assert.notNull(servletContext, "A ServletContext is required");
@@ -79,7 +79,7 @@ public final class MockMvc {
 
 	/**
 	 * A default request builder merged into every performed request.
-	 * @see org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder#defaultRequest(RequestBuilder)
+	 * @see org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder#defaultRequest(RequestBuilder)
 	 */
 	void setDefaultRequest(RequestBuilder requestBuilder) {
 		this.defaultRequestBuilder = requestBuilder;
@@ -87,7 +87,7 @@ public final class MockMvc {
 
 	/**
 	 * Expectations to assert after every performed request.
-	 * @see org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder#alwaysExpect(ResultMatcher)
+	 * @see org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder#alwaysExpect(ResultMatcher)
 	 */
 	void setGlobalResultMatchers(List<ResultMatcher> resultMatchers) {
 		Assert.notNull(resultMatchers, "resultMatchers is required");
@@ -96,7 +96,7 @@ public final class MockMvc {
 
 	/**
 	 * General actions to apply after every performed request.
-	 * @see org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder#alwaysDo(ResultHandler)
+	 * @see org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder#alwaysDo(ResultHandler)
 	 */
 	void setGlobalResultHandlers(List<ResultHandler> resultHandlers) {
 		Assert.notNull(resultHandlers, "resultHandlers is required");
@@ -109,12 +109,12 @@ public final class MockMvc {
 	 *
 	 * @param requestBuilder used to prepare the request to execute;
 	 * see static factory methods in
-	 * {@link org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders}
+	 * {@link org.springframework.test.web.servlet.request.MockMvcRequestBuilders}
 	 *
 	 * @return an instance of {@link ResultActions}; never {@code null}
 	 *
-	 * @see org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders
-	 * @see org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers
+	 * @see org.springframework.test.web.servlet.request.MockMvcRequestBuilders
+	 * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers
 	 */
 	public ResultActions perform(RequestBuilder requestBuilder) throws Exception {
 

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvcBuilder.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 /**
  * Builds a {@link MockMvc}.

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MockMvcBuilderSupport.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import java.util.List;
 
@@ -31,7 +31,7 @@ import org.springframework.web.context.WebApplicationContext;
  * Base class for MockMvc builder implementations, providing the capability to
  * create a {@link MockMvc} instance.
  *
- * <p>{@link org.springframework.test.web.mock.servlet.setup.DefaultMockMvcBuilder},
+ * <p>{@link org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder},
  * which derives from this class, provides a concrete {@code build} method,
  * and delegates to abstract methods to obtain a {@link WebApplicationContext}.
  *

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/MvcResult.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/MvcResult.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/RequestBuilder.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/RequestBuilder.java

-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import javax.servlet.ServletContext;
 

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultActions.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultActions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 /**
  * Allows applying actions, such as expectations, on the result of an executed

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultHandler.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 /**
  * Executes a generic action (e.g. printing debug information) on the result of

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/ResultMatcher.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/ResultMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 /**
  * Matches the result of an executed request against some expectation.

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/TestDispatcherServlet.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/TestDispatcherServlet.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import java.io.IOException;
 import java.util.concurrent.Callable;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/package-info.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/package-info.java

@@ -16,6 +16,6 @@
 
 /**
  * Contains server-side support for testing Spring MVC applications.
- * @see org.springframework.test.web.mock.servlet.MockMvc
+ * @see org.springframework.test.web.servlet.MockMvc
  */
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockAsyncContext.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockAsyncContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.io.IOException;
 import java.util.ArrayList;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilder.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Constructor;
@@ -40,9 +40,9 @@ import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockHttpSession;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.RequestBuilder;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedMultiValueMap;
@@ -653,7 +653,7 @@ public class MockHttpServletRequestBuilder implements RequestBuilder, Mergeable
 
 	private MockHttpServletRequest createServlet3Request(ServletContext servletContext) {
 		try {
-			String className = "org.springframework.test.web.mock.servlet.request.Servlet3MockHttpServletRequest";
+			String className = "org.springframework.test.web.servlet.request.Servlet3MockHttpServletRequest";
 			Class<?> clazz = ClassUtils.forName(className, MockHttpServletRequestBuilder.class.getClassLoader());
 			Constructor<?> constructor = clazz.getConstructor(ServletContext.class);
 			return (MockHttpServletRequest) BeanUtils.instantiateClass(constructor, servletContext);

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockMultipartHttpServletRequestBuilder.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -110,7 +110,7 @@ public class MockMultipartHttpServletRequestBuilder extends MockHttpServletReque
 
 	private MockMultipartHttpServletRequest createServlet3Request() {
 		try {
-			String className = "org.springframework.test.web.mock.servlet.request.Servlet3MockMultipartHttpServletRequest";
+			String className = "org.springframework.test.web.servlet.request.Servlet3MockMultipartHttpServletRequest";
 			Class<?> clazz = ClassUtils.forName(className, MockMultipartHttpServletRequestBuilder.class.getClassLoader());
 			Constructor<?> constructor = clazz.getDeclaredConstructor();
 			return (MockMultipartHttpServletRequest) BeanUtils.instantiateClass(constructor);

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/MockMvcRequestBuilders.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import org.springframework.http.HttpMethod;
-import org.springframework.test.web.mock.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.RequestBuilder;
 
 /**
  * Static factory methods for {@link RequestBuilder}s.

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/RequestPostProcessor.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/RequestPostProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/Servlet3MockHttpServletRequest.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockHttpServletRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.io.IOException;
 import java.util.Collection;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/request/Servlet3MockMultipartHttpServletRequest.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/Servlet3MockMultipartHttpServletRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import java.io.IOException;
 import java.util.Collection;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/client/response/package-info.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/package-info.java

@@ -15,9 +15,9 @@
  */
 
 /**
- * Contains built-in {@link org.springframework.test.web.mock.client.ResponseCreator}
+ * Contains built-in {@link org.springframework.test.web.servlet.RequestBuilder}
  * implementations. Use
- * {@link org.springframework.test.web.mock.client.response.MockRestResponseCreators}
+ * {@link org.springframework.test.web.servlet.request.MockMvcRequestBuilders}
  * to gain access to instances of those implementations.
  */
-package org.springframework.test.web.mock.client.response;
+package org.springframework.test.web.servlet.request;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ContentResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.util.Map;
 
@@ -29,9 +29,9 @@ import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.support.XmlExpectationsHelper;
+import org.springframework.test.util.XmlExpectationsHelper;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.w3c.dom.Node;
 
 /**

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/CookieResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/CookieResultMatchers.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import javax.servlet.http.Cookie;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for response cookie assertions. An instance of this class is

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/FlashAttributeResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchers.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.*;
+import static org.springframework.test.util.AssertionErrors.*;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for "output" flash attribute assertions. An instance of this class is

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/HandlerResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HandlerResultMatchers.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.lang.reflect.Method;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/HeaderResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for response header assertions. An instance of this

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/JsonPathResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/JsonPathResultMatchers.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
@@ -22,9 +22,9 @@ import static org.hamcrest.Matchers.instanceOf;
 import java.util.List;
 
 import org.hamcrest.Matcher;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.support.JsonPathExpectationsHelper;
+import org.springframework.test.util.JsonPathExpectationsHelper;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for assertions on the response content using <a

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/MockMvcResultHandlers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultHandlers.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultHandler;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultHandler;
 import org.springframework.util.CollectionUtils;
 
 /**

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/MockMvcResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/MockMvcResultMatchers.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
 
 import java.util.Map;
 
 import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Static, factory methods for {@link ResultMatcher}-based result actions.

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ModelResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ModelResultMatchers.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/PrintingResultHandler.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import java.util.Enumeration;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultHandler;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultHandler;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.web.method.HandlerMethod;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/RequestResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/RequestResultMatchers.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.hamcrest.Matchers.equalTo;
 
@@ -26,8 +26,8 @@ import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.web.context.request.async.AsyncTask;
 import org.springframework.web.context.request.async.DeferredResult;
 import org.springframework.web.context.request.async.WebAsyncManager;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/StatusResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.springframework.http.HttpStatus;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 
 /**
  * Factory for assertions on the response status. An instance of this class is

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/ViewResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/ViewResultMatchers.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
-import static org.springframework.test.web.mock.AssertionErrors.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.web.servlet.ModelAndView;
 
 /**

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/XpathResultMatchers.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import java.util.Map;
 
@@ -22,9 +22,9 @@ import javax.xml.xpath.XPathExpressionException;
 
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.support.XpathExpectationsHelper;
+import org.springframework.test.util.XpathExpectationsHelper;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.w3c.dom.Node;
 
 /**

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/result/package-info.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/package-info.java

@@ -16,8 +16,8 @@
 
 /**
  * Contains built-in {@code ResultMatcher} and {@code ResultHandler} implementations.
- * Use {@link org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers}
- * and {@link org.springframework.test.web.mock.servlet.result.MockMvcResultHandlers}
+ * Use {@link org.springframework.test.web.servlet.result.MockMvcResultMatchers}
+ * and {@link org.springframework.test.web.servlet.result.MockMvcResultHandlers}
  * to access to instances of those implementations.
  */
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/DefaultMockMvcBuilder.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,12 +23,12 @@ import javax.servlet.Filter;
 import javax.servlet.ServletContext;
 
 import org.springframework.mock.web.MockServletConfig;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.MockMvcBuilder;
-import org.springframework.test.web.mock.servlet.MockMvcBuilderSupport;
-import org.springframework.test.web.mock.servlet.RequestBuilder;
-import org.springframework.test.web.mock.servlet.ResultHandler;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvcBuilder;
+import org.springframework.test.web.servlet.MockMvcBuilderSupport;
+import org.springframework.test.web.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.ResultHandler;
+import org.springframework.test.web.servlet.ResultMatcher;
 import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -142,7 +142,7 @@ public class DefaultMockMvcBuilder<Self extends MockMvcBuilder> extends MockMvcB
 	 * default properties defined here.
 	 *
 	 * @param requestBuilder a RequestBuilder; see static factory methods in
-	 * {@link org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders}
+	 * {@link org.springframework.test.web.servlet.request.MockMvcRequestBuilders}
 	 * .
 	 */
 	@SuppressWarnings("unchecked")
@@ -157,7 +157,7 @@ public class DefaultMockMvcBuilder<Self extends MockMvcBuilder> extends MockMvcB
 	 * {@code "application/json"}, etc.
 	 *
 	 * @param resultMatcher a ResultMatcher; see static factory methods in
-	 * {@link org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers}
+	 * {@link org.springframework.test.web.servlet.result.MockMvcResultMatchers}
 	 */
 	@SuppressWarnings("unchecked")
 	public final <T extends Self> T alwaysExpect(ResultMatcher resultMatcher) {
@@ -171,7 +171,7 @@ public class DefaultMockMvcBuilder<Self extends MockMvcBuilder> extends MockMvcB
 	 * request and resulting response to {@code System.out}.
 	 *
 	 * @param resultHandler a ResultHandler; see static factory methods in
-	 * {@link org.springframework.test.web.mock.servlet.result.MockMvcResultHandlers}
+	 * {@link org.springframework.test.web.servlet.result.MockMvcResultHandlers}
 	 */
 	@SuppressWarnings("unchecked")
 	public final <T extends Self> T alwaysDo(ResultHandler resultHandler) {

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/MockMvcBuilders.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import javax.servlet.ServletContext;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.MockMvcBuilder;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvcBuilder;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/PatternMappingFilterProxy.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/PatternMappingFilterProxy.java

@@ -10,7 +10,7 @@
  * 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.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.io.IOException;
 import java.util.ArrayList;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StandaloneMockMvcBuilder.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.util.ArrayList;
 import java.util.Arrays;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StubWebApplicationContext.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;

spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/package-info.java → spring-test-mvc/src/main/java/org/springframework/test/web/servlet/setup/package-info.java

@@ -16,7 +16,7 @@
 
 /**
  * Contains built-in {@code MockMvcBuilder} implementations.
- * Use {@link org.springframework.test.web.mock.servlet.setup.MockMvcBuilders}
+ * Use {@link org.springframework.test.web.servlet.setup.MockMvcBuilders}
  * to access to instances of those implementations.
  */
-package org.springframework.test.web.mock.servlet.setup;
+package org.springframework.test.web.servlet.setup;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/Person.java → spring-test-mvc/src/test/java/org/springframework/test/web/Person.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock;
+package org.springframework.test.web;
 
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlRootElement;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/MockClientHttpRequestFactoryTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client;
+package org.springframework.test.web.client;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.anything;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.anything;
 
 import java.net.URI;
 
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/ContentRequestMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/match/ContentRequestMatchersTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import static org.hamcrest.Matchers.hasXPath;
 
@@ -21,8 +21,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.match.ContentRequestMatchers;
-import org.springframework.test.web.mock.client.match.MockRestRequestMatchers;
+import org.springframework.test.web.client.match.ContentRequestMatchers;
+import org.springframework.test.web.client.match.MockRestRequestMatchers;
 
 /**
  * Tests for {@link ContentRequestMatchers}.

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/JsonPathRequestMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/match/JsonPathRequestMatchersTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 
@@ -21,7 +21,7 @@ import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.match.JsonPathRequestMatchers;
+import org.springframework.test.web.client.match.JsonPathRequestMatchers;
 
 /**
  * Tests for {@link JsonPathRequestMatchers}.

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/RequestMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/match/RequestMatchersTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import static org.hamcrest.Matchers.containsString;
 
@@ -24,7 +24,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.match.MockRestRequestMatchers;
+import org.springframework.test.web.client.match.MockRestRequestMatchers;
 
 /**
  * Tests for {@link MockRestRequestMatchers}.

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/match/XpathRequestMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/match/XpathRequestMatchersTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.match;
+package org.springframework.test.web.client.match;
 
 import java.io.IOException;
 
@@ -21,7 +21,7 @@ import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.mock.http.client.MockClientHttpRequest;
-import org.springframework.test.web.mock.client.match.XpathRequestMatchers;
+import org.springframework.test.web.client.match.XpathRequestMatchers;
 
 /**
  * Tests for {@link XpathRequestMatchers}.

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/response/ResponseCreatorsTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/response/ResponseCreatorsTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.response;
+package org.springframework.test.web.client.response;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -26,8 +26,8 @@ import org.junit.Test;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.client.MockClientHttpResponse;
-import org.springframework.test.web.mock.client.response.DefaultResponseCreator;
-import org.springframework.test.web.mock.client.response.MockRestResponseCreators;
+import org.springframework.test.web.client.response.DefaultResponseCreator;
+import org.springframework.test.web.client.response.MockRestResponseCreators;
 import org.springframework.util.FileCopyUtils;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/SampleTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/SampleTests.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples;
+package org.springframework.test.web.client.samples;
 
 import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.method;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,8 +26,8 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/ContentRequestMatcherTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/ContentRequestMatcherTests.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -29,8 +29,8 @@ import org.junit.Test;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/HeaderRequestMatcherTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/HeaderRequestMatcherTests.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.header;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -30,8 +30,8 @@ import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/JsonPathRequestMatcherTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/JsonPathRequestMatcherTests.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isIn;
 import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.jsonPath;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.jsonPath;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -34,8 +34,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/XmlContentRequestMatcherTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XmlContentRequestMatcherTests.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.hasXPath;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -35,8 +35,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 

spring-test-mvc/src/test/java/org/springframework/test/web/mock/client/samples/matchers/XpathRequestMatcherTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/client/samples/matchers/XpathRequestMatcherTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.client.samples.matchers;
+package org.springframework.test.web.client.samples.matchers;
 
 import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.equalTo;
@@ -21,10 +21,10 @@ import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.lessThan;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.content;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.requestTo;
-import static org.springframework.test.web.mock.client.match.MockRestRequestMatchers.xpath;
-import static org.springframework.test.web.mock.client.response.MockRestResponseCreators.withSuccess;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.content;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.xpath;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -43,8 +43,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.client.MockRestServiceServer;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/StubMvcResult.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet;
+package org.springframework.test.web.servlet;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.MvcResult;
+import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/request/MockHttpServletRequestBuilderTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.request;
+package org.springframework.test.web.servlet.request;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -39,6 +39,7 @@ import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
 import org.springframework.mock.web.MockServletContext;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.servlet.FlashMap;
 import org.springframework.web.servlet.support.SessionFlashMapManager;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/ContentResultMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.ContentResultMatchers;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.ContentResultMatchers;
 
 /**
  * @author Rossen Stoyanchev

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/FlashAttributeResultMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/FlashAttributeResultMatchersTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import org.junit.Test;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.FlashAttributeResultMatchers;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.FlashAttributeResultMatchers;
 import org.springframework.web.servlet.FlashMap;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/JsonPathResultMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/JsonPathResultMatchersTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.JsonPathResultMatchers;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.JsonPathResultMatchers;
 
 /**
  * Tests for {@link JsonPathResultMatchers}.

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/ModelResultMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/ModelResultMatchersTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.hamcrest.Matchers.is;
 
@@ -22,9 +22,9 @@ import java.util.Date;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.ModelResultMatchers;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.ModelResultMatchers;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.servlet.ModelAndView;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/PrintingResultHandlerTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -31,8 +31,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.PrintingResultHandler;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.PrintingResultHandler;
 import org.springframework.util.Assert;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/StatusResultMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import static org.junit.Assert.fail;
 
@@ -27,10 +27,10 @@ import org.springframework.core.Conventions;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.StatusResultMatchers;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.StatusResultMatchers;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/result/XpathResultMatchersTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/XpathResultMatchersTests.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.result;
+package org.springframework.test.web.servlet.result;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.web.mock.servlet.StubMvcResult;
-import org.springframework.test.web.mock.servlet.result.XpathResultMatchers;
+import org.springframework.test.web.servlet.StubMvcResult;
+import org.springframework.test.web.servlet.result.XpathResultMatchers;
 
 /**
  * Tests for {@link XpathResultMatchers}.

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/JavaConfigTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,9 +29,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.samples.context.JavaConfigTests.WebConfig;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.samples.context.JavaConfigTests.WebConfig;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/SecurityRequestPostProcessors.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/SecurityRequestPostProcessors.java

@@ -10,7 +10,7 @@
  * 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.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,7 +34,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.web.context.HttpRequestResponseHolder;
 import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
 import org.springframework.security.web.context.SecurityContextRepository;
-import org.springframework.test.web.mock.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
 import org.springframework.util.Assert;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/SpringSecurityTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/SpringSecurityTests.java

@@ -11,15 +11,15 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.samples.context.SecurityRequestPostProcessors.user;
-import static org.springframework.test.web.mock.servlet.samples.context.SecurityRequestPostProcessors.userDeatilsService;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.samples.context.SecurityRequestPostProcessors.user;
+import static org.springframework.test.web.servlet.samples.context.SecurityRequestPostProcessors.userDeatilsService;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -36,11 +36,11 @@ import org.springframework.security.web.context.HttpSessionSecurityContextReposi
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.MvcResult;
-import org.springframework.test.web.mock.servlet.ResultMatcher;
-import org.springframework.test.web.mock.servlet.request.RequestPostProcessor;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/WebAppResourceTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/WebAppResourceTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.handler;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.handler;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,8 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.resource.DefaultServletHttpRequestHandler;
 

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/context/XmlConfigTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/context/XmlConfigTests.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.context;
+package org.springframework.test.web.servlet.samples.context;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,8 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.setup.MockMvcBuilders;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/AsyncTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java

@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.request;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.concurrent.Callable;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.request.async.DeferredResult;
 

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ExceptionHandlerTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ExceptionHandlerTests.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Test;
 import org.springframework.stereotype.Controller;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/FileUploadControllerTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.fileUpload;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.io.IOException;
 

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/FilterTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java

@@ -10,14 +10,14 @@
  * 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.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.flash;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.io.IOException;
 import java.security.Principal;
@@ -33,7 +33,7 @@ import javax.validation.Valid;
 
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
+import org.springframework.test.web.Person;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RedirectTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RedirectTests.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import javax.validation.Valid;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.ui.Model;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.PathVariable;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RequestBuilderTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -26,8 +26,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
-import org.springframework.test.web.mock.servlet.request.RequestPostProcessor;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/RequestParameterTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestParameterTests.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
+import org.springframework.test.web.Person;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ResponseBodyTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ResponseBodyTests.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
+import org.springframework.test.web.Person;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/ViewResolutionTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/ViewResolutionTests.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone;
+package org.springframework.test.web.servlet.samples.standalone;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasProperty;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.forwardedUrl;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.model;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.xpath;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.forwardedUrl;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,8 +34,8 @@ import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.oxm.jaxb.Jaxb2Marshaller;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.ui.Model;
 import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.accept.FixedContentNegotiationStrategy;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resulthandlers/PrintingResultHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resulthandlers;
+package org.springframework.test.web.servlet.samples.standalone.resulthandlers;
 
 import org.junit.Test;
 import org.springframework.stereotype.Controller;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/ContentAssertionTests.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.*;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/CookieAssertionTests.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.cookie;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.cookie;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/FlashAttributeAssertionTests.java

@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.flash;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.net.URL;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HandlerAssertionTests.java

@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.handler;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.handler;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.lang.reflect.Method;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**

spring-test-mvc/src/test/java/org/springframework/test/web/mock/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java → spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.java

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.mock.servlet.samples.standalone.resultmatchers;
+package org.springframework.test.web.servlet.samples.standalone.resultmatchers;
 
 import static org.hamcrest.Matchers.nullValue;
-import static org.springframework.test.web.mock.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.header;
-import static org.springframework.test.web.mock.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.mock.servlet.setup.MockMvcBuilders.standaloneSetup;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
 
 import java.util.Date;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.stereotype.Controller;
-import org.springframework.test.web.mock.Person;
-import org.springframework.test.web.mock.servlet.MockMvc;
+import org.springframework.test.web.Person;
+import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;