GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add missing section ids in reference documentation 

Add missing id attributes to <section> elements in the reference
documentation to ensure stable anchor links in HTML output.

Issue: SPR-9410
Backport-Issue: SPR-9346
Backport-Commit: 2a75c57d3c
pull/52/merge
Oliver Gierke 14 years ago committed by Chris Beams
parent
1380d053c4
commit
9ca407d55e
13 changed files with 86 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      spring-framework-reference/src/beans-context-additional.xml
  2. 4
      spring-framework-reference/src/beans-dependencies.xml
  3. 10
      spring-framework-reference/src/classic-spring.xml
  4. 44
      spring-framework-reference/src/expressions.xml
  5. 6
      spring-framework-reference/src/jdbc.xml
  6. 6
      spring-framework-reference/src/jms.xml
  7. 2
      spring-framework-reference/src/mvc.xml
  8. 6
      spring-framework-reference/src/new-in-3.0.xml
  9. 38
      spring-framework-reference/src/new-in-3.1.xml
  10. 26
      spring-framework-reference/src/overview.xml
  11. 18
      spring-framework-reference/src/oxm.xml
  12. 4
      spring-framework-reference/src/remoting.xml
  13. 6
      spring-framework-reference/src/transaction.xml

2
spring-framework-reference/src/beans-context-additional.xml
Unescape View File

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

4
spring-framework-reference/src/beans-dependencies.xml
Unescape View File

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

10
spring-framework-reference/src/classic-spring.xml
Unescape View File

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

44
spring-framework-reference/src/expressions.xml
Unescape View File

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

6
spring-framework-reference/src/jdbc.xml
Unescape View File

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

6
spring-framework-reference/src/jms.xml
Unescape View File

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

2
spring-framework-reference/src/mvc.xml
Unescape View File

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

6
spring-framework-reference/src/new-in-3.0.xml
Unescape View File

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

38
spring-framework-reference/src/new-in-3.1.xml
Unescape View File

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

26
spring-framework-reference/src/overview.xml
Unescape View File

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

18
spring-framework-reference/src/oxm.xml
Unescape View File

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

4
spring-framework-reference/src/remoting.xml
Unescape View File

@ -1434,7 +1434,7 @@ URI location = template.postForLocation(uri, booking, "1");
information on using the execute method and the meaning of its other information on using the execute method and the meaning of its other
method arguments.</para> method arguments.</para>
<section> <section id="rest-resttemplate-uri">
<title>Working with the URI</title> <title>Working with the URI</title>
<para>For each of the main HTTP methods, the <classname>RestTemplate</classname> <para>For each of the main HTTP methods, the <classname>RestTemplate</classname>
@ -1484,7 +1484,7 @@ URI uri = uriComponents.toUri();</programlisting>
</section> </section>
<section> <section id="rest-template-headers">
<title>Dealing with request and response headers</title> <title>Dealing with request and response headers</title>
<para>Besides the methods described above, the <classname>RestTemplate</classname> <para>Besides the methods described above, the <classname>RestTemplate</classname>

6
spring-framework-reference/src/transaction.xml
Unescape View File

@ -95,7 +95,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--> <!--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> <title>Global transactions</title>
<para>Global transactions enable you to work with multiple transactional <para>Global transactions enable you to work with multiple transactional
@ -125,7 +125,7 @@
compelling alternatives for declarative transaction management.</para> compelling alternatives for declarative transaction management.</para>
</section> </section>
<section> <section id="transaction-local">
<title>Local transactions</title> <title>Local transactions</title>
<para>Local transactions are resource-specific, such as a transaction <para>Local transactions are resource-specific, such as a transaction
@ -140,7 +140,7 @@
transactions are invasive to the programming model.</para> transactions are invasive to the programming model.</para>
</section> </section>
<section> <section id="transaction-programming-model">
<title>Spring Framework's consistent programming model</title> <title>Spring Framework's consistent programming model</title>
<para>Spring resolves the disadvantages of global and local <para>Spring resolves the disadvantages of global and local

Write Preview
Loading…
Cancel
Save