diff --git a/build.gradle b/build.gradle index 9cf5f917cc..e4d5a1c3d8 100644 --- a/build.gradle +++ b/build.gradle @@ -80,21 +80,23 @@ configure(allprojects) { project -> ext.javadocLinks = [ "http://docs.oracle.com/javase/6/docs/api", - "http://docs.oracle.com/javaee/6/api", - "http://portals.apache.org/pluto/portlet-2.0-apidocs/", - "http://commons.apache.org/proper/commons-codec/apidocs/", + "http://docs.oracle.com/javaee/6/api/", + "http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // CommonJ + "http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/", + "http://glassfish.java.net/nonav/docs/v3/api/", "http://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", "http://docs.jboss.org/jbossas/javadoc/7.1.2.Final/", - "http://aopalliance.sourceforge.net/doc/", - "http://glassfish.java.net/nonav/docs/v3/api/", - "http://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/", // commonj - "http://quartz-scheduler.org/api/2.1.7/", - "http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", - "http://fasterxml.github.com/jackson-core/javadoc/2.2.0/", - "http://jackson.codehaus.org/1.9.12/javadoc/", - "http://pic.dhe.ibm.com/infocenter/wasinfo/v7r0/topic/com.ibm.websphere.javadoc.doc/web/apidocs/", - "http://tiles.apache.org/framework/apidocs/", + "http://commons.apache.org/proper/commons-lang/javadocs/api-2.5/", + "http://commons.apache.org/proper/commons-codec/apidocs/", "http://commons.apache.org/proper/commons-dbcp/apidocs/", + "http://portals.apache.org/pluto/portlet-2.0-apidocs/", + "http://tiles.apache.org/framework/apidocs/", + "http://aopalliance.sourceforge.net/doc/", + "http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/", + "http://ehcache.org/apidocs/", + "http://quartz-scheduler.org/api/2.1.7/", + "http://jackson.codehaus.org/1.9.12/javadoc/", + "http://fasterxml.github.com/jackson-core/javadoc/2.2.0/", ] as String[] } diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java index f0787b61d4..58cb335b3f 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java @@ -263,11 +263,10 @@ public class MockServletContext implements ServletContext { } /** - * This method uses the Java Activation framework, which returns - * "application/octet-stream" when the mime type is unknown (i.e. it never returns - * {@code null}). In order to maintain the {@link ServletContext#getMimeType(String) - * contract, as of version 3.2.2, this method returns null if the mimeType is - * "application/octet-stream". + * This method uses the Java Activation framework, which returns "application/octet-stream" + * when the mime type is unknown (i.e. it never returns {@code null}). In order to maintain + * the {@link ServletContext#getMimeType(String)} contract, this method returns {@code null} + * if the mimeType is "application/octet-stream", as of Spring 3.2.2. */ public String getMimeType(String filePath) { String mimeType = MimeTypeResolver.getMimeType(filePath); diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContext.java b/spring-test/src/main/java/org/springframework/test/context/TestContext.java index d2719b50a0..63d1de2863 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestContext.java @@ -167,7 +167,8 @@ public class TestContext extends AttributeAccessorSupport { * context} associated with this test context is dirty and should be * discarded. Do this if a test has modified the context — for example, * by replacing a bean definition or modifying the state of a singleton bean. - * @deprecated As of Spring 3.2.2, use {@link #markApplicationContextDirty(HierarchyMode)} instead. + * @deprecated as of Spring 3.2.2; use + * {@link #markApplicationContextDirty(DirtiesContext.HierarchyMode)} instead. */ @Deprecated public void markApplicationContextDirty() { diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java index f865d532da..f2a45a46e3 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java @@ -20,6 +20,7 @@ import java.lang.reflect.Method; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.context.ApplicationContext; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; @@ -47,8 +48,8 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi * Marks the {@linkplain ApplicationContext application context} of the supplied * {@linkplain TestContext test context} as * {@linkplain TestContext#markApplicationContextDirty() dirty}, and sets the - * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE - * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context to {@code true}. + * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE} + * in the test context to {@code true}. * @param testContext the test context whose application context should * marked as dirty * @deprecated as of Spring 3.2.2, use {@link #dirtyContext(TestContext, HierarchyMode)} instead. @@ -61,10 +62,10 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi /** * Marks the {@linkplain ApplicationContext application context} of the supplied - * {@linkplain TestContext test context} as {@linkplain - * TestContext#markApplicationContextDirty(HierarchyMode) dirty} and sets the - * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE - * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context to {@code true}. + * {@linkplain TestContext test context} as + * {@linkplain TestContext#markApplicationContextDirty(DirtiesContext.HierarchyMode) dirty} + * and sets {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE} + * in the test context to {@code true}. * @param testContext the test context whose application context should * marked as dirty * @param hierarchyMode the context cache clearing mode to be applied if the @@ -85,9 +86,8 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi * AFTER_EACH_TEST_METHOD}, the {@linkplain ApplicationContext application * context} of the test context will be * {@linkplain TestContext#markApplicationContextDirty() marked as dirty} and the - * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE - * REINJECT_DEPENDENCIES_ATTRIBUTE} in the test context will be set to - * {@code true}. + * {@link DependencyInjectionTestExecutionListener#REINJECT_DEPENDENCIES_ATTRIBUTE} + * in the test context will be set to {@code true}. */ @Override public void afterTestMethod(TestContext testContext) throws Exception { diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java index e5576fefb0..0878f4d246 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java @@ -269,16 +269,15 @@ public class MockServletContext implements ServletContext { } /** - * This method uses the Java Activation framework, which returns - * "application/octet-stream" when the mime type is unknown (i.e. it never returns - * {@code null}). In order to maintain the {@link ServletContext#getMimeType(String) - * contract, as of version 3.2.2, this method returns null if the mimeType is - * "application/octet-stream". + * This method uses the Java Activation framework, which returns "application/octet-stream" + * when the mime type is unknown (i.e. it never returns {@code null}). In order to maintain + * the {@link ServletContext#getMimeType(String)} contract, this method returns {@code null} + * if the mimeType is "application/octet-stream", as of Spring 3.2.2. */ @Override public String getMimeType(String filePath) { String mimeType = MimeTypeResolver.getMimeType(filePath); - return ("application/octet-stream".equals(mimeType)) ? null : mimeType; + return ("application/octet-stream".equals(mimeType) ? null : mimeType); } @Override