diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java b/spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java index cf859ab427393a0236b7c5c7518f5ebd65415b26..b00b48060e84e1a22bc1f191551205f787de57d1 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -16,7 +16,6 @@ package org.springframework.scheduling.config; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.support.CronTrigger; /** @@ -26,13 +25,13 @@ import org.springframework.scheduling.support.CronTrigger; * * @author Chris Beams * @since 3.2 - * @see Scheduled#cron() + * @see org.springframework.scheduling.annotation.Scheduled#cron() * @see ScheduledTaskRegistrar#setCronTasksList(java.util.List) * @see org.springframework.scheduling.TaskScheduler */ public class CronTask extends TriggerTask { - private String expression; + private final String expression; /** @@ -54,7 +53,9 @@ public class CronTask extends TriggerTask { this.expression = cronTrigger.getExpression(); } + public String getExpression() { - return expression; + return this.expression; } + } diff --git a/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java index 744a6cd2b9e6f9f5da52d81f82bf2999f33d769b..44dccafe90fc2ff9f816736e48096849e12c376d 100644 --- a/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java +++ b/spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -16,11 +16,8 @@ package org.springframework.test.util; -import static org.springframework.test.util.MatcherAssertionErrors.assertThat; - import java.io.StringReader; import java.util.Map; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Source; @@ -29,11 +26,12 @@ import javax.xml.transform.dom.DOMSource; import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.XMLUnit; import org.hamcrest.Matcher; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; +import static org.springframework.test.util.MatcherAssertionErrors.*; + /** * A helper class for assertions on XML content. * @@ -73,15 +71,12 @@ public class XmlExpectationsHelper { * Parse the expected and actual content strings as XML and assert that the * two are "similar" -- i.e. they contain the same elements and attributes * regardless of order. - * *

Use of this method assumes the * XMLUnit library is available. - * * @param expected the expected XML content * @param actual the actual XML content - * - * @see MockMvcResultMatchers#xpath(String, Object...) - * @see MockMvcResultMatchers#xpath(String, Map, Object...) + * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Object...) + * @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Map, Object...) */ public void assertXmlEqual(String expected, String actual) throws Exception { diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java b/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java index 744a57ebf025cc85c67826207a943f55b7ce1cd2..c680c27f7e3091cd182dd5e2d8f9983bce36d297 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java +++ b/spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2013 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. @@ -16,6 +16,10 @@ package org.springframework.transaction.config; +/** + * @author Chris Beams + * @since 3.1 + */ public abstract class TransactionManagementConfigUtils { /** diff --git a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java index 438b88a4b6e8700fc4f8c69243d41a9f01200d03..ec1173d73fcbf970e45c4e584080bf68d68dc23f 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -32,6 +32,9 @@ import org.springframework.util.ClassUtils; */ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConverter { + private static final boolean jaxb2Present = + ClassUtils.isPresent("javax.xml.bind.Binder", AllEncompassingFormHttpMessageConverter.class.getClassLoader()); + private static final boolean jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", AllEncompassingFormHttpMessageConverter.class.getClassLoader()) && ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", AllEncompassingFormHttpMessageConverter.class.getClassLoader()); @@ -40,9 +43,6 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv ClassUtils.isPresent("org.codehaus.jackson.map.ObjectMapper", AllEncompassingFormHttpMessageConverter.class.getClassLoader()) && ClassUtils.isPresent("org.codehaus.jackson.JsonGenerator", AllEncompassingFormHttpMessageConverter.class.getClassLoader()); - private static final boolean jaxb2Present = - ClassUtils.isPresent("javax.xml.bind.Binder", AllEncompassingFormHttpMessageConverter.class.getClassLoader()); - @SuppressWarnings("deprecation") public AllEncompassingFormHttpMessageConverter() { diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java index e534359a6cb8d4a5533380318892aa49923188ad..5f0f6fc308f8dbb1b3b7c80df55dd183ef3bbc7f 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -19,7 +19,6 @@ package org.springframework.http.converter.xml; import javax.xml.transform.Source; import org.springframework.http.converter.FormHttpMessageConverter; -import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; /** * Extension of {@link org.springframework.http.converter.FormHttpMessageConverter}, @@ -27,7 +26,8 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage * * @author Juergen Hoeller * @since 3.0.3 - * @deprecated in favor of {@link AllEncompassingFormHttpMessageConverter} + * @deprecated in favor of + * {@link org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter} */ @Deprecated public class XmlAwareFormHttpMessageConverter extends FormHttpMessageConverter { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java index e0ec640619c07f0b1ce16667bbe136f46da92ad5..7b67dc163a315bc663d31f132b384fc198cb6265 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java @@ -28,7 +28,6 @@ import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.HttpSessionRequiredException; import org.springframework.web.context.request.WebRequest; import org.springframework.web.context.support.WebApplicationObjectSupport; -import org.springframework.web.servlet.mvc.LastModified; /** * Convenient superclass for any kind of web content generator, @@ -204,7 +203,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport { * programmatically do a lastModified calculation as described in * {@link WebRequest#checkNotModified(long)}. Default is "false", * effectively relying on whether the handler implements - * {@link LastModified} or not. + * {@link org.springframework.web.servlet.mvc.LastModified} or not. */ public void setAlwaysMustRevalidate(boolean mustRevalidate) { this.alwaysMustRevalidate = mustRevalidate; diff --git a/spring-webmvc/src/main/resources/META-INF/spring.handlers b/spring-webmvc/src/main/resources/META-INF/spring.handlers index b92dfeebba72d07098f07a0e32bd67a3426b5914..565c2c2c767154736ba6efefdb42a04286017c67 100644 --- a/spring-webmvc/src/main/resources/META-INF/spring.handlers +++ b/spring-webmvc/src/main/resources/META-INF/spring.handlers @@ -1 +1 @@ -http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler \ No newline at end of file +http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler