From 9ca407d55eb55b3c59737ba4635c359b51e19a8e 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-9410 Backport-Issue: SPR-9346 Backport-Commit: 2a75c57d3c4a295e677c54a987425525e9cef0ed --- .../src/beans-context-additional.xml | 2 +- .../src/beans-dependencies.xml | 4 +- .../src/classic-spring.xml | 10 ++--- .../src/expressions.xml | 44 +++++++++---------- spring-framework-reference/src/jdbc.xml | 6 +-- spring-framework-reference/src/jms.xml | 6 +-- spring-framework-reference/src/mvc.xml | 2 +- spring-framework-reference/src/new-in-3.0.xml | 6 +-- spring-framework-reference/src/new-in-3.1.xml | 38 ++++++++-------- spring-framework-reference/src/overview.xml | 26 +++++------ spring-framework-reference/src/oxm.xml | 18 ++++---- spring-framework-reference/src/remoting.xml | 4 +- .../src/transaction.xml | 6 +-- 13 files changed, 86 insertions(+), 86 deletions(-) diff --git a/spring-framework-reference/src/beans-context-additional.xml b/spring-framework-reference/src/beans-context-additional.xml index 326e9abcff2..4a045da9608 100644 --- a/spring-framework-reference/src/beans-context-additional.xml +++ b/spring-framework-reference/src/beans-context-additional.xml @@ -610,7 +610,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/spring-framework-reference/src/beans-dependencies.xml b/spring-framework-reference/src/beans-dependencies.xml index cd57291a7df..bbf4175c1fe 100644 --- a/spring-framework-reference/src/beans-dependencies.xml +++ b/spring-framework-reference/src/beans-dependencies.xml @@ -264,7 +264,7 @@ public class ExampleBean {
-
+
Dependency resolution process The container performs bean dependency resolution as follows: @@ -858,7 +858,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/spring-framework-reference/src/classic-spring.xml b/spring-framework-reference/src/classic-spring.xml index f82b02df74b..ef0cc9e5bcd 100644 --- a/spring-framework-reference/src/classic-spring.xml +++ b/spring-framework-reference/src/classic-spring.xml @@ -353,7 +353,7 @@ ...
-
+
JMS Usage One of the benefits of Spring's JMS support is to shield the user @@ -391,7 +391,7 @@ -
+
JmsTemplate Located in the package @@ -406,7 +406,7 @@ that the point-to-point domain, Queues, will be used.
-
+
Asynchronous Message Reception
-
+
Connections The ConnectionFactory interface is part of @@ -440,7 +440,7 @@ javax.jmsTopicConnection.
-
+
Transaction Management In a JMS 1.0.2 environment the class diff --git a/spring-framework-reference/src/expressions.xml b/spring-framework-reference/src/expressions.xml index ce8a489a696..47dc5fece82 100644 --- a/spring-framework-reference/src/expressions.xml +++ b/spring-framework-reference/src/expressions.xml @@ -276,7 +276,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 @@ -305,7 +305,7 @@ boolean result = exp.getValue(context, Boolean.class); // evaluates to true -
+
Type Conversion By default SpEL uses the conversion service available in Spring @@ -513,7 +513,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 @@ -575,7 +575,7 @@ parser.parseExpression("Officers['advisors'][0].PlaceOfBirth.Country").setValue(
-
+
Inline lists Lists can be expressed directly in an expression using {} notation. @@ -592,7 +592,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 @@ -611,7 +611,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 @@ -625,10 +625,10 @@ boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue( Boolean.class);
-
+
Operators -
+
Relational operators The relational operators; equal, not equal, less than, less than @@ -666,7 +666,7 @@ boolean falseValue = These are case insensitive.
-
+
Logical operators The logical operators that are supported are and, or, and not. @@ -701,7 +701,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. @@ -742,7 +742,7 @@ int minusTwentyOne = parser.parseExpression("1+2-3*8").getValue(Integer.class);
-
+
Assignment Setting of a property is done by using the assignment operator. @@ -764,7 +764,7 @@ String aleks = parser.parseExpression("Name = 'Alexandar Seovic'").getValue(inve
-
+
Types The special 'T' operator can be used to specify an instance of @@ -786,7 +786,7 @@ boolean trueValue =
-
+
Constructors Constructors can be invoked using the new operator. The fully @@ -820,7 +820,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 @@ -847,7 +847,7 @@ List<Integer> primesGreaterThanTen =
Nu Overview of the Spring Framework -
+
Core Container The Core @@ -149,7 +149,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 @@ -183,7 +183,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, @@ -214,7 +214,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 @@ -568,7 +568,7 @@ TR: OK. Added to diagram.--> -
+
Spring Dependencies and Depending on Spring Although Spring provides integration and support for a huge @@ -588,7 +588,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 @@ -676,7 +676,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 @@ -761,7 +761,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 @@ -799,7 +799,7 @@ TR: OK. Added to diagram.--> alternative implementation of JCL using SLF4J as an example.
-
+
Using SLF4J
@@ -882,7 +882,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/spring-framework-reference/src/oxm.xml b/spring-framework-reference/src/oxm.xml index 9a4694dbb95..65ef24cccfb 100644 --- a/spring-framework-reference/src/oxm.xml +++ b/spring-framework-reference/src/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 @@ -306,7 +306,7 @@ public class Application { ]]>
-
+
XML Schema-based Configuration Marshallers could be configured more concisely using tags from the OXM namespace. @@ -441,7 +441,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 @@ -456,7 +456,7 @@ public class Application { ]]>
-
+
Mapping Although it is possible to rely on Castor's default marshalling behavior, it might be necessary to have @@ -490,7 +490,7 @@ public class Application { XMLBeans web site . The Spring-WS integration classes reside in the org.springframework.oxm.xmlbeans package. -
+
XmlBeansMarshaller The XmlBeansMarshaller @@ -568,7 +568,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 @@ -647,7 +647,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/spring-framework-reference/src/remoting.xml b/spring-framework-reference/src/remoting.xml index b4896b241c9..360927d9573 100644 --- a/spring-framework-reference/src/remoting.xml +++ b/spring-framework-reference/src/remoting.xml @@ -1434,7 +1434,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 @@ -1484,7 +1484,7 @@ URI uri = uriComponents.toUri();
-
+
Dealing with request and response headers Besides the methods described above, the RestTemplate diff --git a/spring-framework-reference/src/transaction.xml b/spring-framework-reference/src/transaction.xml index e7db8907a74..b2dbed4ce3e 100644 --- a/spring-framework-reference/src/transaction.xml +++ b/spring-framework-reference/src/transaction.xml @@ -95,7 +95,7 @@ -
+
Global transactions Global transactions enable you to work with multiple transactional @@ -125,7 +125,7 @@ compelling alternatives for declarative transaction management.
-
+
Local transactions Local transactions are resource-specific, such as a transaction @@ -140,7 +140,7 @@ transactions are invasive to the programming model.
-
+
Spring Framework's consistent programming model Spring resolves the disadvantages of global and local