Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79 from olivergierke/SPR-9346

Browse Source 
* SPR-9346:
  Add missing section ids in reference documentation
This commit is contained in:
Chris Beams
2012-05-15 13:26:05 +03:00
parent 1d0e484eac 2a75c57d3c
commit 347e8dfc86
13 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/reference/docbook/beans-context-additional.xml
View File

@@ -611,7 +611,7 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</
does.</para>
</section>
<section>
<section id="context-deploy-rar">
<title>Deploying a Spring ApplicationContext as a J2EE RAR file</title>
<para>In Spring 2.5 and later, it is possible to deploy a Spring

4
src/reference/docbook/beans-dependencies.xml
View File

@@ -265,7 +265,7 @@ public class ExampleBean {
</sidebar>
</section>
<section>
<section id="beans-dependency-resolution">
<title>Dependency resolution process</title>
<para>The container performs bean dependency resolution as follows:</para>
@@ -859,7 +859,7 @@ support=support@example.co.uk</programlisting>
the container uses internally.</para>
</section>
<section>
<section id="beans-collection-merge-limitations">
<title>Limitations of collection merging</title>
<para>You cannot merge different collection types (such as a

10
src/reference/docbook/classic-spring.xml
View File

@@ -354,7 +354,7 @@
<para>...</para>
</section>
<section>
<section id="classic-spring-jms">
<title>JMS Usage</title>
<para>One of the benefits of Spring's JMS support is to shield the user
@@ -392,7 +392,7 @@
</note>
</sidebar>
<section>
<section id="classic-spring-jms-template">
<title>JmsTemplate</title>
<para>Located in the package
@@ -407,7 +407,7 @@
that the point-to-point domain, Queues, will be used.</para>
</section>
<section>
<section id="classic-spring-aysnc-messages">
<title>Asynchronous Message Reception </title>
<para><link
@@ -423,7 +423,7 @@
rely only on the JMS 1.0.2 API. </para>
</section>
<section>
<section id="classic-spring-jms-connections">
<title>Connections</title>
<para>The <classname>ConnectionFactory</classname> interface is part of
@@ -441,7 +441,7 @@
<classname>javax.jmsTopicConnection</classname>.</para>
</section>
<section>
<section id="classic-spring-jms-tx-management">
<title>Transaction Management</title>
<para>In a JMS 1.0.2 environment the class

44
src/reference/docbook/expressions.xml
View File

@@ -277,7 +277,7 @@ String name = (String) exp.getValue(tesla);
<programlisting language="java">Expression exp = parser.parseExpression("name == 'Nikola Tesla'");
boolean result = exp.getValue(context, Boolean.class); // evaluates to true</programlisting>
<section>
<section id="expressions-evaluation-context">
<title>The EvaluationContext interface</title>
<para>The interface <interfacename>EvaluationContext</interfacename> is
@@ -306,7 +306,7 @@ boolean result = exp.getValue(context, Boolean.class); // evaluates to true</pr
expressions. Please refer to the JavaDoc of these classes for more
details.</para>
<section>
<section id="expressions-type-conversion">
<title>Type Conversion</title>
<para>By default SpEL uses the conversion service available in Spring
@@ -514,7 +514,7 @@ Object nullValue = parser.parseExpression("null").getValue();
Double.parseDouble().</para>
</section>
<section>
<section id="expressions-properties-arrays">
<title>Properties, Arrays, Lists, Maps, Indexers</title>
<para>Navigating with property references is easy, just use a period to
@@ -576,7 +576,7 @@ parser.parseExpression("Officers['advisors'][0].PlaceOfBirth.Country").setValue(
</programlisting>
</section>
<section>
<section id="expressions-inline-lists">
<title>Inline lists</title>
<para>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.</para>
</section>
<section>
<section id="expressions-array-construction">
<title>Array construction</title>
<para>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.</para>
</section>
<section>
<section id="expressions-methods">
<title>Methods</title>
<para>Methods are invoked using typical Java programming syntax. You may
@@ -626,10 +626,10 @@ boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue(
Boolean.class);</programlisting>
</section>
<section>
<section id="expressions-operators">
<title>Operators</title>
<section>
<section id="expressions-operators-relational">
<title>Relational operators</title>
<para>The relational operators; equal, not equal, less than, less than
@@ -667,7 +667,7 @@ boolean falseValue =
These are case insensitive.</para>
</section>
<section>
<section id="expressions-operators-logical">
<title>Logical operators</title>
<para>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);</programlisting></para>
</section>
<section>
<section id="expressions-operators-mathematical">
<title>Mathematical operators</title>
<para>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);
</section>
</section>
<section>
<section id="expressions-assignment">
<title>Assignment</title>
<para>Setting of a property is done by using the assignment operator.
@@ -765,7 +765,7 @@ String aleks = parser.parseExpression("Name = 'Alexandar Seovic'").getValue(inve
<para></para>
</section>
<section>
<section id="expressions-types">
<title>Types</title>
<para>The special 'T' operator can be used to specify an instance of
@@ -787,7 +787,7 @@ boolean trueValue =
</programlisting>
</section>
<section>
<section id="expressions-constrcutors">
<title>Constructors</title>
<para>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"</programlisting>
<section>
<section id="expressions-this-root">
<title>The #this and #root variables</title>
<para>The variable #this is always defined and refers to the current
@@ -848,7 +848,7 @@ List&lt;Integer&gt; primesGreaterThanTen =
</section>
<!--
<section>
<section id="expressions-root">
<title>The #root variable</title>
<para>The variable #root is always defined and refers to the
@@ -906,7 +906,7 @@ String helloWorldReversed =
parser.parseExpression("#reverseString('hello')").getValue(context, String.class);</programlisting>
</section>
<section>
<section id="expressions-bean-references">
<title>Bean references</title>
<para>If the evaluation context has been configured with a bean resolver it is possible to
lookup beans from an expression using the (@) symbol.
@@ -919,7 +919,7 @@ context.setBeanResolver(new MyBeanResolver());
Object bean = parser.parseExpression("@foo").getValue(context);</programlisting>
</section>
<section>
<section id="expressions-operator-ternary">
<title>Ternary Operator (If-Then-Else)</title>
<para>You can use the ternary operator for performing if-then-else
@@ -945,7 +945,7 @@ String queryResultString =
shorter syntax for the ternary operator.</para>
</section>
<section>
<section id="expressions-operator-elvis">
<title>The Elvis Operator</title>
<para>The Elvis operator is a shortening of the ternary operator syntax
@@ -986,7 +986,7 @@ name = parser.parseExpression("Name?:'Elvis Presley'").getValue(context, String.
System.out.println(name); // Elvis Presley</programlisting>
</section>
<section>
<section id="expressions-operator-safe-navigation">
<title>Safe Navigation operator</title>
<para>The Safe Navigation operator is used to avoid a
@@ -1023,7 +1023,7 @@ System.out.println(city); // null - does not throw NullPointerException!!!</prog
</note>
</section>
<section>
<section id="expressions-collection-selection">
<title>Collection Selection</title>
<para>Selection is a powerful expression language feature that allows you
@@ -1058,7 +1058,7 @@ System.out.println(city); // null - does not throw NullPointerException!!!</prog
<literal>$[...]</literal>.</para>
</section>
<section>
<section id="expressions-collection-projection">
<title>Collection Projection</title>
<para>Projection allows a collection to drive the evaluation of a
@@ -1079,7 +1079,7 @@ List placesOfBirth = (List)parser.parseExpression("Members.![placeOfBirth.city]"
projection expression against each map entry.</para>
</section>
<section>
<section id="expressions-templating">
<title>Expression templating</title>
<para>Expression templates allow a mixing of literal text with one or

6
src/reference/docbook/jdbc.xml
View File

@@ -2925,7 +2925,7 @@ public class DataAccessUnitTestTemplate {
</section>
</section>
<section>
<section id="jdbc-intializing-datasource">
<title>Initializing a DataSource</title>
<para>The <literal>org.springframework.jdbc.datasource.init</literal>
@@ -2935,7 +2935,7 @@ public class DataAccessUnitTestTemplate {
<classname>DataSource</classname> for an application, but sometimes you
need to initialize an instance running on a server somewhere.</para>
<section>
<section id="jdbc-initializing-datasource-xml">
<title>Initializing a database instance using Spring XML</title>
<para>If you want to initialize a database and you can provide a
@@ -2999,7 +2999,7 @@ public class DataAccessUnitTestTemplate {
can simply use the <classname>DataSourceInitializer</classname>
directly, and define it as a component in your application.</para>
<section>
<section id="jdbc-client-component-initialization">
<title>Initialization of Other Components that Depend on the
Database</title>

6
src/reference/docbook/jms.xml
View File

@@ -140,7 +140,7 @@
should ensure that it references the managed implementation of the
<classname>ConnectionFactory</classname>.</para>
<section>
<section id="jms-caching-resources">
<title>Caching Messaging Resources</title>
<para>The standard API involves creating many intermediate objects. To
@@ -154,7 +154,7 @@
IConnectionFactory are provided.</para>
</section>
<section>
<section id="jms-connection-factory">
<title>SingleConnectionFactory</title>
<para>Spring provides an implementation of the
@@ -171,7 +171,7 @@
from JNDI.</para>
</section>
<section>
<section id="jdbc-connection-factory-caching">
<title>CachingConnectionFactory</title>
<para>The <classname>CachingConnectionFactory</classname> extends the

2
src/reference/docbook/mvc.xml
View File

@@ -3600,7 +3600,7 @@ public String onSubmit(<emphasis role="bold">@RequestPart("meta-data") MetaData
<section id="mvc-exceptionhandlers">
<title>Handling exceptions</title>
<section>
<section id="mvc-exceptionhandlers-resolver">
<title
id="mvc-HandlerExceptionResolver"><interfacename>HandlerExceptionResolver</interfacename></title>

6
src/reference/docbook/new-in-3.0.xml
View File

@@ -404,7 +404,7 @@ public class AppConfig {
<literal>AnnotationConfigApplicationContext</literal>.</para>
</section>
<section>
<section id="new-bean-metadata-in-components">
<title>Defining bean metadata within components</title>
<para><literal>@Bean</literal> annotated methods are also supported
@@ -448,7 +448,7 @@ public class AppConfig {
building RESTful web services and web applications. There are also some
new annotations that can be used in any web application.</para>
<section>
<section id="new-feature-rest-support">
<title>Comprehensive REST support</title>
<para>Server-side support for building RESTful applications has been
@@ -471,7 +471,7 @@ public class AppConfig {
information.</para>
</section>
<section>
<section id="new-feature-at-mvc">
<title>@MVC additions</title>
<para>A <literal>mvc</literal> namespace has been introduced that greatly simplifies Spring MVC configuration.</para>

38
src/reference/docbook/new-in-3.1.xml
View File

@@ -16,7 +16,7 @@
yet have dedicated reference documentation but do have Javadoc. In such
cases, fully-qualified class names are given.</para>
<section>
<section id="new-in-3.1-cache-abstraction">
<title>Cache Abstraction</title>
<itemizedlist>
@@ -32,7 +32,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-bean-definition-profiles">
<title>Bean Definition Profiles</title>
<itemizedlist>
@@ -60,7 +60,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-environment-abstraction">
<title>Environment Abstraction</title>
<itemizedlist>
@@ -76,7 +76,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-property-source-abstraction">
<title>PropertySource Abstraction</title>
<itemizedlist>
@@ -101,7 +101,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-code-equivalent-xml-namespaces">
<title>Code equivalents for Spring's XML namespaces</title>
<para>Code-based equivalents to popular Spring XML namespace elements
@@ -169,7 +169,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-hibernate-4-support">
<title>Support for Hibernate 4.x</title>
<itemizedlist>
@@ -180,7 +180,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-test-context-profiles">
<title>TestContext framework support for @Configuration classes and bean
definition profiles</title>
@@ -238,7 +238,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-c-namespace">
<title>c: namespace for more concise constructor injection</title>
<itemizedlist>
@@ -248,7 +248,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-injection-non-javabeans-setters">
<title>Support for injection against non-standard JavaBeans
setters</title>
@@ -260,7 +260,7 @@
setter methods return a reference to 'this'.</para>
</section>
<section>
<section id="new-in-3.1-servlet-3-code-config">
<title>Support for Servlet 3 code-based configuration of Servlet
Container</title>
@@ -284,7 +284,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-servlet-3-multipart-resolver">
<title>Support for Servlet 3 MultipartResolver</title>
<itemizedlist>
@@ -296,7 +296,7 @@
</itemizedlist>
</section>
<section>
<section id="new-in-3.1-jpa-without-xml">
<title>JPA EntityManagerFactory bootstrapping without
persistence.xml</title>
@@ -320,7 +320,7 @@
initializer.</para>
</section>
<section>
<section id="new-in-3.1-handler-method-controller-processing">
<title>New HandlerMethod-based Support Classes For Annotated Controller
Processing</title>
@@ -397,7 +397,7 @@
</section>
<section>
<section id="new-in-3.1-request-mapping-consumes-produces">
<title>"consumes" and "produces" conditions in
<interface>@RequestMapping</interface></title>
@@ -408,7 +408,7 @@
linkend="mvc-ann-requestmapping-produces" /></para>
</section>
<section>
<section id="new-in-3.1-flash-redirect-attributes">
<title>Flash Attributes and
<interfacename>RedirectAttributes</interfacename></title>
@@ -426,7 +426,7 @@
for more details.</para>
</section>
<section>
<section id="new-in-3.1-uri-template-var-enhancements">
<title>URI Template Variable Enhancements</title>
<para>URI template variables from the current request are used in more
@@ -461,7 +461,7 @@
</itemizedlist></para>
</section>
<section>
<section id="new-in-3.1-mvc-valid-requestbody">
<title><interfacename>@Valid</interfacename> On
<interface>@RequestBody</interface> Controller Method Arguments</title>
@@ -474,7 +474,7 @@
<literal>400</literal> response code.</para>
</section>
<section>
<section id="new-in-3.1-mvc-requestpart">
<title><interfacename>@RequestPart</interfacename> Annotation On
Controller Method Arguments</title>
@@ -484,7 +484,7 @@
linkend="mvc-multipart" />.</para>
</section>
<section>
<section id="new-in-3.1-mvc-uricomponentsbuilder">
<title><classname>UriComponentsBuilder</classname> and <classname>UriComponents</classname></title>
<para>A new <classname>UriComponents</classname> class has been added,

26
src/reference/docbook/overview.xml
View File

@@ -108,7 +108,7 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu
<caption><para>Overview of the Spring Framework</para></caption>
</mediaobject></para>
<section>
<section id="overview-core-container">
<title>Core Container</title>
<para>The <link linkend="beans-introduction"><emphasis>Core
@@ -150,7 +150,7 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu
aggregations.</para>
</section>
<section>
<section id="overview-data-access">
<title>Data Access/Integration</title>
<para>The <emphasis>Data Access/Integration</emphasis> 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)</emphasis>.</para>
</section>
<section>
<section id="overview-web">
<title>Web</title>
<para>The <emphasis>Web</emphasis> layer consists of the Web,
@@ -215,7 +215,7 @@ It sounds important.--><!--TR: REVISED, PLS REVIEW.--></para>
functionality of Web-Servlet module.<!--mirrors it in what way?--><!--TR: REVISED, PLS REVIEW. The functionality is mirrored - one for Servlets and the other for Portlets--></para>
</section>
<section>
<section id="overview-aop-instrumentation">
<title>AOP and Instrumentation</title>
<para>Spring's <link
@@ -237,7 +237,7 @@ TR: OK. Added to diagram.--></para>
certain application servers.</para>
</section>
<section>
<section id="overview-testing">
<title>Test</title>
<para>The <emphasis>Test</emphasis> module supports the testing of
@@ -570,7 +570,7 @@ TR: OK. Added to diagram.--></para>
</tgroup>
</table></para>
<section>
<section id="overview-spring-dependencies">
<title>Spring Dependencies and Depending on Spring</title>
<para>Although Spring provides integration and support for a huge
@@ -590,7 +590,7 @@ TR: OK. Added to diagram.--></para>
our samples mostly use Maven.</para>
</section>
<section>
<section id="overview-maven-dependency-management">
<title>Maven Dependency Management</title>
<para>If you are using Maven for dependency management you don't even
@@ -678,7 +678,7 @@ TR: OK. Added to diagram.--></para>
paste if you are using those tools.</para>
</section>
<section>
<section id="overview-ivy-dependency-management">
<title>Ivy Dependency Management</title>
<para>If you prefer to use <ulink
@@ -726,7 +726,7 @@ TR: OK. Added to diagram.--></para>
</section>
</section>
<section>
<section id="overview-logging">
<title>Logging</title>
<para>Logging is a very important dependency for Spring because a) it is
@@ -763,7 +763,7 @@ TR: OK. Added to diagram.--></para>
application works and logs happily to the console out of the box in most
situations, and that's important.</para>
<section>
<section id="overview-not-using-commons-logging">
<title>Not Using Commons Logging</title>
<para>Unfortunately, the runtime discovery algorithm in
@@ -801,7 +801,7 @@ TR: OK. Added to diagram.--></para>
alternative implementation of JCL using SLF4J as an example.</para>
</section>
<section>
<section id="overview-logging-slf4j">
<title>Using SLF4J</title>
</section>
@@ -884,7 +884,7 @@ TR: OK. Added to diagram.--></para>
slf4j-api dependency from other external dependencies (not Spring),
because you only want one version of that API on the classpath.</para>
<section>
<section id="overview-logging-log4j">
<title>Using Log4J</title>
<para>Many people use <ulink
@@ -928,7 +928,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m
log4j.category.org.springframework.beans.factory=DEBUG</programlisting>
<section>
<section id="overview-native-jcl">
<title>Runtime Containers with Native JCL</title>
<para>Many people run their Spring applications in a container that

18
src/reference/docbook/oxm.xml
View File

@@ -55,7 +55,7 @@
<emphasis>unmarshaller</emphasis> deserializes XML stream to an object. In this section, we will describe
the two Spring interfaces used for this purpose.
</para>
<section>
<section id="oxm-marshaller">
<title>Marshaller</title>
<para>
Spring abstracts all marshalling operations behind the
@@ -113,7 +113,7 @@ public interface Marshaller {
</note>
</para>
</section>
<section>
<section id="oxm-unmarshaller">
<title>Unmarshaller</title>
<para>
Similar to the <interfacename>Marshaller</interfacename>, 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 <filename>applicationContext.xml</filename>.
</para>
<section>
<section id="oxm-xmlmappingexception">
<title>XmlMappingException</title>
<para>
Spring converts exceptions from the underlying O/X mapping tool to its own exception hierarchy with the
@@ -317,7 +317,7 @@ public class Application {
]]></programlisting>
</para>
</section>
<section>
<section id="oxm-schema-based-config">
<title>XML Schema-based Configuration</title>
<para>
Marshallers could be configured more concisely using tags from the OXM namespace.
@@ -452,7 +452,7 @@ public class Application {
<citetitle>Castor web site</citetitle></ulink>. The Spring integration classes reside in the
<package>org.springframework.oxm.castor</package> package.
</para>
<section>
<section id="oxm-castor-marshaller">
<title>CastorMarshaller</title>
<para>
As with JAXB, the <classname>CastorMarshaller</classname> implements both the
@@ -467,7 +467,7 @@ public class Application {
</beans>]]></programlisting>
</section>
<section>
<section id="oxm-castor-mapping">
<title>Mapping</title>
<para>
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 {
<citetitle>XMLBeans web site </citetitle></ulink>. The Spring-WS integration classes reside
in the <package>org.springframework.oxm.xmlbeans</package> package.
</para>
<section>
<section id="oxm-xmlbeans-marshaller">
<title>XmlBeansMarshaller</title>
<para>
The <classname>XmlBeansMarshaller</classname>
@@ -579,7 +579,7 @@ public class Application {
<citetitle>JiBX web site</citetitle></ulink>. The Spring integration classes reside in the
<package>org.springframework.oxm.jibx</package> package.
</para>
<section>
<section id="oxm-jibx-marshaller">
<title>JibxMarshaller</title>
<para>
The <classname>JibxMarshaller</classname> class implements both the
@@ -658,7 +658,7 @@ public class Application {
<citetitle>XStream web site</citetitle></ulink>. The Spring integration classes reside in the
<package>org.springframework.oxm.xstream</package> package.
</para>
<section>
<section id="oxm-xstream-marshaller">
<title>XStreamMarshaller</title>
<para>
The <classname>XStreamMarshaller</classname> does not require any configuration, and can be configured

4
src/reference/docbook/remoting.xml
View File

@@ -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.</para>
<section>
<section id="rest-resttemplate-uri">
<title>Working with the URI</title>
<para>For each of the main HTTP methods, the <classname>RestTemplate</classname>
@@ -1485,7 +1485,7 @@ URI uri = uriComponents.toUri();</programlisting>
</section>
<section>
<section id="rest-template-headers">
<title>Dealing with request and response headers</title>
<para>Besides the methods described above, the <classname>RestTemplate</classname>

6
src/reference/docbook/transaction.xml
View File

@@ -96,7 +96,7 @@
<!--Gave global, local, and spring models their own sections. These need to be called out at a higher level, esp. Spring advantage! TR: OK-->
<section>
<section id="transaction-global">
<title>Global transactions</title>
<para>Global transactions enable you to work with multiple transactional
@@ -126,7 +126,7 @@
compelling alternatives for declarative transaction management.</para>
</section>
<section>
<section id="transaction-local">
<title>Local transactions</title>
<para>Local transactions are resource-specific, such as a transaction
@@ -141,7 +141,7 @@
transactions are invasive to the programming model.</para>
</section>
<section>
<section id="transaction-programming-model">
<title>Spring Framework's consistent programming model</title>
<para>Spring resolves the disadvantages of global and local