diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java b/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java index df1bacf8c6..47d7fa23d9 100644 --- a/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java +++ b/spring-context/src/main/java/org/springframework/scripting/groovy/package-info.java @@ -1,6 +1,6 @@ /** * Package providing integration of - * Groovy + * Groovy * into Spring's scripting infrastructure. */ package org.springframework.scripting.groovy; diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java index 35dde5f28a..3c01940292 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/package-info.java @@ -1,5 +1,5 @@ /** - * Package providing integration of Castor + * Package providing integration of Castor * within Spring's O/X Mapping support. */ package org.springframework.oxm.castor; diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java index 94e65a0ce6..5a4ab71cf5 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/package-info.java @@ -1,5 +1,5 @@ /** - * Package providing integration of XStream + * Package providing integration of XStream * with Spring's O/X Mapping support. */ package org.springframework.oxm.xstream; diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml b/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml index f54e293fdf..425058f094 100644 --- a/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml +++ b/spring-oxm/src/test/resources/org/springframework/oxm/castor/mapping.xml @@ -1,5 +1,5 @@ - + Castor generated mapping file diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java index b714d57ac4..8da060c04a 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java @@ -25,7 +25,7 @@ import org.springframework.http.MediaType; /** * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} that - * can read and write JSON using Jackson 2.x's {@link ObjectMapper}. + * can read and write JSON using Jackson 2.x's {@link ObjectMapper}. * *

This converter can be used to bind to typed beans, or untyped {@link java.util.HashMap HashMap} instances. * diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java index 347dba1882..1eefee90b9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java @@ -40,7 +40,7 @@ import org.springframework.web.servlet.View; /** * Spring MVC {@link View} that renders JSON content by serializing the model for the current request - * using Jackson 2's {@link ObjectMapper}. + * using Jackson 2's {@link ObjectMapper}. * *

By default, the entire contents of the model map (with the exception of framework-specific classes) * will be encoded as JSON. If the model contains only one key, you can have it extracted encoded as JSON diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlView.java index 66b9d4c4eb..f30c266978 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlView.java @@ -28,7 +28,7 @@ import org.springframework.web.servlet.view.json.AbstractJackson2View; /** * Spring MVC {@link View} that renders XML content by serializing the model for the current request - * using Jackson 2's {@link XmlMapper}. + * using Jackson 2's {@link XmlMapper}. * *

The Object to be serialized is supplied as a parameter in the model. The first serializable * entry is used. Users can either specify a specific entry in the model via the diff --git a/src/asciidoc/core-expressions.adoc b/src/asciidoc/core-expressions.adoc index fceaff34f9..1701914888 100644 --- a/src/asciidoc/core-expressions.adoc +++ b/src/asciidoc/core-expressions.adoc @@ -1095,7 +1095,7 @@ ternary operator. [[expressions-operator-elvis]] === The Elvis Operator The Elvis operator is a shortening of the ternary operator syntax and is used in the -http://groovy.codehaus.org/Operators#Operators-ElvisOperator(%3F%3A)[Groovy] language. +http://www.groovy-lang.org/operators.html#_elvis_operator[Groovy] language. With the ternary operator syntax you usually have to repeat a variable twice, for example: @@ -1144,7 +1144,7 @@ Here is a more complex example. [[expressions-operator-safe-navigation]] === Safe Navigation operator The Safe Navigation operator is used to avoid a `NullPointerException` and comes from -the http://groovy.codehaus.org/Operators#Operators-SafeNavigationOperator(%3F.)[Groovy] +the http://www.groovy-lang.org/operators.html#_safe_navigation_operator[Groovy] language. Typically when you have a reference to an object you might need to verify that it is not null before accessing methods or properties of the object. To avoid this, the safe navigation operator will simply return null instead of throwing an exception. diff --git a/src/asciidoc/data-access.adoc b/src/asciidoc/data-access.adoc index 33438ecc39..9063bf97de 100644 --- a/src/asciidoc/data-access.adoc +++ b/src/asciidoc/data-access.adoc @@ -7046,7 +7046,7 @@ Available attributes are: XStream is a simple library to serialize objects to XML and back again. It does not require any mapping, and generates clean XML. -For more information on XStream, refer to the http://xstream.codehaus.org/[__XStream +For more information on XStream, refer to the http://x-stream.github.io/[__XStream web site__]. The Spring integration classes reside in the `org.springframework.oxm.xstream` package. diff --git a/src/asciidoc/integration.adoc b/src/asciidoc/integration.adoc index f2d8de913e..af1707bd78 100644 --- a/src/asciidoc/integration.adoc +++ b/src/asciidoc/integration.adoc @@ -876,13 +876,6 @@ proxy will take care of forwarding the call to the server-side object via JMS. } ---- -You may also wish to investigate the support provided by the -http://lingo.codehaus.org/[Lingo] project, which (to quote the homepage blurb) "__... is -a lightweight POJO based remoting and messaging library based on the Spring Framework's -remoting libraries which extends it to support JMS.__" - - - [[remoting-amqp]] === AMQP @@ -8039,8 +8032,8 @@ in the Spring Framework. Find below links to further resources about the various dynamic languages described in this chapter. -* The http://jruby.codehaus.org/[JRuby] homepage -* The http://groovy.codehaus.org/[Groovy] homepage +* The http://jruby.org/[JRuby] homepage +* The http://www.groovy-lang.org/[Groovy] homepage * The http://www.beanshell.org/[BeanShell] homepage