From 2a75c57d3c4a295e677c54a987425525e9cef0ed Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 15 May 2012 11:48:14 +0200 Subject: [PATCH] Add missing section ids in reference documentation Add missing id attributes to
elements in the reference documentation to ensure stable anchor links in HTML output. Issue: SPR-9346 --- .../docbook/beans-context-additional.xml | 2 +- src/reference/docbook/beans-dependencies.xml | 4 +- src/reference/docbook/classic-spring.xml | 10 ++--- src/reference/docbook/expressions.xml | 44 +++++++++---------- src/reference/docbook/jdbc.xml | 6 +-- src/reference/docbook/jms.xml | 6 +-- src/reference/docbook/mvc.xml | 2 +- src/reference/docbook/new-in-3.0.xml | 6 +-- src/reference/docbook/new-in-3.1.xml | 38 ++++++++-------- src/reference/docbook/overview.xml | 26 +++++------ src/reference/docbook/oxm.xml | 18 ++++---- src/reference/docbook/remoting.xml | 4 +- src/reference/docbook/transaction.xml | 6 +-- 13 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/reference/docbook/beans-context-additional.xml b/src/reference/docbook/beans-context-additional.xml index a1538434a62..c5b72033691 100644 --- a/src/reference/docbook/beans-context-additional.xml +++ b/src/reference/docbook/beans-context-additional.xml @@ -611,7 +611,7 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.
-
+
Deploying a Spring ApplicationContext as a J2EE RAR file In Spring 2.5 and later, it is possible to deploy a Spring diff --git a/src/reference/docbook/beans-dependencies.xml b/src/reference/docbook/beans-dependencies.xml index c8562213667..f9311d0240c 100644 --- a/src/reference/docbook/beans-dependencies.xml +++ b/src/reference/docbook/beans-dependencies.xml @@ -265,7 +265,7 @@ public class ExampleBean {
-
+
Dependency resolution process The container performs bean dependency resolution as follows: @@ -859,7 +859,7 @@ support=support@example.co.uk the container uses internally.
-
+
Limitations of collection merging You cannot merge different collection types (such as a diff --git a/src/reference/docbook/classic-spring.xml b/src/reference/docbook/classic-spring.xml index b412a7f43b9..07d67305bb3 100644 --- a/src/reference/docbook/classic-spring.xml +++ b/src/reference/docbook/classic-spring.xml @@ -354,7 +354,7 @@ ...
-
+
JMS Usage One of the benefits of Spring's JMS support is to shield the user @@ -392,7 +392,7 @@ -
+
JmsTemplate Located in the package @@ -407,7 +407,7 @@ that the point-to-point domain, Queues, will be used.
-
+
Asynchronous Message Reception
-
+
Connections The ConnectionFactory interface is part of @@ -441,7 +441,7 @@ javax.jmsTopicConnection.
-
+
Transaction Management In a JMS 1.0.2 environment the class diff --git a/src/reference/docbook/expressions.xml b/src/reference/docbook/expressions.xml index 4a2ff221ce0..4f72ca5cfa3 100644 --- a/src/reference/docbook/expressions.xml +++ b/src/reference/docbook/expressions.xml @@ -277,7 +277,7 @@ String name = (String) exp.getValue(tesla); Expression exp = parser.parseExpression("name == 'Nikola Tesla'"); boolean result = exp.getValue(context, Boolean.class); // evaluates to true -
+
The EvaluationContext interface The interface EvaluationContext is @@ -306,7 +306,7 @@ boolean result = exp.getValue(context, Boolean.class); // evaluates to true -
+
Type Conversion By default SpEL uses the conversion service available in Spring @@ -514,7 +514,7 @@ Object nullValue = parser.parseExpression("null").getValue(); Double.parseDouble().
-
+
Properties, Arrays, Lists, Maps, Indexers Navigating with property references is easy, just use a period to @@ -576,7 +576,7 @@ parser.parseExpression("Officers['advisors'][0].PlaceOfBirth.Country").setValue(
-
+
Inline lists Lists can be expressed directly in an expression using {} notation. @@ -593,7 +593,7 @@ List listOfLists = (List) parser.parseExpression("{{'a','b'},{'x','y'}}").getVal to represent the expression, rather than building a new list on each evaluation.
-
+
Array construction Arrays can be built using the familiar Java syntax, optionally @@ -612,7 +612,7 @@ int[][] numbers3 = (int[][]) parser.parseExpression("new int[4][5]").getValue(co a multi-dimensional array.
-
+
Methods Methods are invoked using typical Java programming syntax. You may @@ -626,10 +626,10 @@ boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue( Boolean.class);
-
+
Operators -
+
Relational operators The relational operators; equal, not equal, less than, less than @@ -667,7 +667,7 @@ boolean falseValue = These are case insensitive.
-
+
Logical operators The logical operators that are supported are and, or, and not. @@ -702,7 +702,7 @@ String expression = "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')"; boolean falseValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
-
+
Mathematical operators The addition operator can be used on numbers, strings and dates. @@ -743,7 +743,7 @@ int minusTwentyOne = parser.parseExpression("1+2-3*8").getValue(Integer.class);
-
+
Assignment Setting of a property is done by using the assignment operator. @@ -765,7 +765,7 @@ String aleks = parser.parseExpression("Name = 'Alexandar Seovic'").getValue(inve
-
+
Types The special 'T' operator can be used to specify an instance of @@ -787,7 +787,7 @@ boolean trueValue =
-
+
Constructors Constructors can be invoked using the new operator. The fully @@ -821,7 +821,7 @@ parser.parseExpression("Name = #newName").getValue(context); System.out.println(tesla.getName()) // "Mike Tesla" -
+
The #this and #root variables The variable #this is always defined and refers to the current @@ -848,7 +848,7 @@ List<Integer> primesGreaterThanTen =
Nu Overview of the Spring Framework -
+
Core Container The Core @@ -150,7 +150,7 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu aggregations.
-
+
Data Access/Integration The Data Access/Integration layer consists of @@ -184,7 +184,7 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu Java objects).
-
+
Web The Web layer consists of the Web, @@ -215,7 +215,7 @@ It sounds important.--> functionality of Web-Servlet module.
-
+
AOP and Instrumentation Spring's certain application servers.
-
+
Test The Test module supports the testing of @@ -570,7 +570,7 @@ TR: OK. Added to diagram.--> -
+
Spring Dependencies and Depending on Spring Although Spring provides integration and support for a huge @@ -590,7 +590,7 @@ TR: OK. Added to diagram.--> our samples mostly use Maven.
-
+
Maven Dependency Management If you are using Maven for dependency management you don't even @@ -678,7 +678,7 @@ TR: OK. Added to diagram.--> paste if you are using those tools.
-
+
Ivy Dependency Management If you prefer to use
-
+
Logging Logging is a very important dependency for Spring because a) it is @@ -763,7 +763,7 @@ TR: OK. Added to diagram.--> application works and logs happily to the console out of the box in most situations, and that's important. -
+
Not Using Commons Logging Unfortunately, the runtime discovery algorithm in @@ -801,7 +801,7 @@ TR: OK. Added to diagram.--> alternative implementation of JCL using SLF4J as an example.
-
+
Using SLF4J
@@ -884,7 +884,7 @@ TR: OK. Added to diagram.--> slf4j-api dependency from other external dependencies (not Spring), because you only want one version of that API on the classpath. -
+
Using Log4J Many people use -
+
Runtime Containers with Native JCL Many people run their Spring applications in a container that diff --git a/src/reference/docbook/oxm.xml b/src/reference/docbook/oxm.xml index a710e808b02..2cc0563c5ff 100644 --- a/src/reference/docbook/oxm.xml +++ b/src/reference/docbook/oxm.xml @@ -55,7 +55,7 @@ unmarshaller deserializes XML stream to an object. In this section, we will describe the two Spring interfaces used for this purpose. -
+
Marshaller Spring abstracts all marshalling operations behind the @@ -113,7 +113,7 @@ public interface Marshaller {
-
+
Unmarshaller Similar to the Marshaller, there is the @@ -170,7 +170,7 @@ public interface Unmarshaller { one class. This means that you can wire up one marshaller class and refer to it both as a marshaller and an unmarshaller in your applicationContext.xml. -
+
XmlMappingException Spring converts exceptions from the underlying O/X mapping tool to its own exception hierarchy with the @@ -317,7 +317,7 @@ public class Application { ]]>
-
+
XML Schema-based Configuration Marshallers could be configured more concisely using tags from the OXM namespace. @@ -452,7 +452,7 @@ public class Application { Castor web site. The Spring integration classes reside in the org.springframework.oxm.castor package. -
+
CastorMarshaller As with JAXB, the CastorMarshaller implements both the @@ -467,7 +467,7 @@ public class Application { ]]>
-
+
Mapping Although it is possible to rely on Castor's default marshalling behavior, it might be necessary to have @@ -501,7 +501,7 @@ public class Application { XMLBeans web site . The Spring-WS integration classes reside in the org.springframework.oxm.xmlbeans package. -
+
XmlBeansMarshaller The XmlBeansMarshaller @@ -579,7 +579,7 @@ public class Application { JiBX web site. The Spring integration classes reside in the org.springframework.oxm.jibx package. -
+
JibxMarshaller The JibxMarshaller class implements both the @@ -658,7 +658,7 @@ public class Application { XStream web site. The Spring integration classes reside in the org.springframework.oxm.xstream package. -
+
XStreamMarshaller The XStreamMarshaller does not require any configuration, and can be configured diff --git a/src/reference/docbook/remoting.xml b/src/reference/docbook/remoting.xml index d14151c71ab..c0f831c6b74 100644 --- a/src/reference/docbook/remoting.xml +++ b/src/reference/docbook/remoting.xml @@ -1435,7 +1435,7 @@ URI location = template.postForLocation(uri, booking, "1"); information on using the execute method and the meaning of its other method arguments. -
+
Working with the URI For each of the main HTTP methods, the RestTemplate @@ -1485,7 +1485,7 @@ URI uri = uriComponents.toUri();
-
+
Dealing with request and response headers Besides the methods described above, the RestTemplate diff --git a/src/reference/docbook/transaction.xml b/src/reference/docbook/transaction.xml index 00f4a90c58b..e04ef281cd2 100644 --- a/src/reference/docbook/transaction.xml +++ b/src/reference/docbook/transaction.xml @@ -96,7 +96,7 @@ -
+
Global transactions Global transactions enable you to work with multiple transactional @@ -126,7 +126,7 @@ compelling alternatives for declarative transaction management.
-
+
Local transactions Local transactions are resource-specific, such as a transaction @@ -141,7 +141,7 @@ transactions are invasive to the programming model.
-
+
Spring Framework's consistent programming model Spring resolves the disadvantages of global and local