switched to use XInclude

This commit is contained in:
Thomas Risberg 2009-04-14 21:37:40 +00:00
parent 338a7ee2de
commit 1facd45c5e
52 changed files with 3461 additions and 3403 deletions

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="aop-api">
<title>Spring AOP APIs</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="aop">
<title>Aspect Oriented Programming with Spring</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="beans">
<title>The IoC container</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="cci">
<title>JCA CCI</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="dao">
<title>DAO support</title>
<section id="dao-introduction">

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="springbeansdtd">
<title><literal>spring-beans-2.0.dtd</literal></title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="dynamic-language">
<title>Dynamic language support</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="ejb">
<title>Enterprise Java Beans (EJB) integration</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="expressions">
<title>Spring Expression Language (SpEL)</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="getting-started">
<title>Getting started with Spring</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="jdbc">
<title>Data access using JDBC</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="jms">
<title>JMS (Java Message Service)</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="jmx">
<title>JMX</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="mail">
<title>Email</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="metadata">
<title>Annotations and Source Level Metadata Support</title>
<section id="metadata-introduction">

View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="mvc">
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="mvc" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Web MVC framework</title>
<section id="mvc-introduction">
@ -150,7 +153,7 @@
<title>Features of Spring Web MVC</title>
<!-- insert some content about Spring Web Flow here -->
&swf-sidebar;
<xi:include href="swf-sidebar.xml"/>
<para>Spring's web module provides a wealth of unique web support
features, including:</para>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="new-in-3">
<title>What's new in Spring 3.0?</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="orm">
<title>Object Relational Mapping (ORM) data access</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="introduction">
<title>Introduction</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="oxm">
<title>Marshalling XML using O/X Mappers</title>

View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<chapter id="portlet">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="portlet" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Portlet MVC Framework</title>
<section id="portlet-introduction">
@ -40,7 +43,7 @@
activities that generate what is displayed to the user.</para>
<!-- insert some content about Spring Web Flow here -->
&swf-sidebar;
<xi:include href="swf-sidebar.xml"/>
<para>The dual phases of portlet requests are one of the real strengths
of the JSR-168 specification. For example, dynamic search results can be

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<preface id="preface">
<title>Preface</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="remoting">
<title>Remoting and web services using Spring</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="resources">
<title>Resources</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="rest">
<title>REST support</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="scheduling">
<title>Scheduling and Thread Pooling</title>
<section id="scheduling-introduction">

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="spring-form.tld">
<title>spring-form.tld</title>
<section id="spring-form.tld-intro">

View File

@ -1,44 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
<!ENTITY preface SYSTEM "preface.xml">
<!ENTITY overview SYSTEM "overview.xml">
<!ENTITY whats-new-in-3 SYSTEM "new-in-3.xml">
<!ENTITY getting-started SYSTEM "getting-started.xml">
<!ENTITY beans SYSTEM "beans.xml">
<!ENTITY resources SYSTEM "resources.xml">
<!ENTITY validation SYSTEM "validation.xml">
<!ENTITY expressions SYSTEM "expressions.xml">
<!ENTITY aop SYSTEM "aop.xml">
<!ENTITY aop-api SYSTEM "aop-api.xml">
<!ENTITY transaction SYSTEM "transaction.xml">
<!ENTITY metadata SYSTEM "metadata.xml">
<!ENTITY dao SYSTEM "dao.xml">
<!ENTITY jdbc SYSTEM "jdbc.xml">
<!ENTITY orm SYSTEM "orm.xml">
<!ENTITY oxm SYSTEM "oxm.xml">
<!ENTITY mvc SYSTEM "mvc.xml">
<!ENTITY view SYSTEM "view.xml">
<!ENTITY rest SYSTEM "rest.xml">
<!ENTITY web-integration SYSTEM "web-integration.xml">
<!ENTITY portlet SYSTEM "portlet.xml">
<!ENTITY remoting SYSTEM "remoting.xml">
<!ENTITY ejb SYSTEM "ejb.xml">
<!ENTITY jms SYSTEM "jms.xml">
<!ENTITY jmx SYSTEM "jmx.xml">
<!ENTITY cci SYSTEM "cci.xml">
<!ENTITY mail SYSTEM "mail.xml">
<!ENTITY scheduling SYSTEM "scheduling.xml">
<!ENTITY testing SYSTEM "testing.xml">
<!ENTITY dynamic-languages SYSTEM "dynamic-languages.xml">
<!ENTITY xsd-configuration SYSTEM "xsd-configuration.xml">
<!ENTITY xml-custom SYSTEM "xml-custom.xml">
<!ENTITY dtd SYSTEM "dtd.xml">
<!ENTITY spring-tld SYSTEM "spring.tld.xml">
<!ENTITY spring-form-tld SYSTEM "spring-form.tld.xml">
<!ENTITY swf-sidebar SYSTEM "swf-sidebar.xml">
]>
<book>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<book xmlns:xi="http://www.w3.org/2001/XInclude">
<bookinfo>
<title>Reference Documentation</title>
<subtitle>(Work in progress)</subtitle>
@ -135,8 +99,8 @@
<copyright>
<year>2004-2009</year>
<holder>Rod Johnson, Juergen Hoeller, Alef Arendsen, Colin Sampaleanu, Rob Harrop, Thomas Risberg, Darren Davison,
Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis, Costin Leau,
Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma
Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis,
Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma
</holder>
</copyright>
<legalnotice>
@ -149,10 +113,10 @@
</bookinfo>
<!-- front matter -->
<toc/>
&preface;
&overview;
&whats-new-in-3;
&getting-started;
<xi:include href="preface.xml"/>
<xi:include href="overview.xml"/>
<xi:include href="new-in-3.xml"/>
<xi:include href="getting-started.xml"/>
<part id="spring-core">
<title>Core Technologies</title>
<partintro id="spring-core-intro">
@ -215,13 +179,13 @@
</listitem>
</itemizedlist>
</partintro>
&beans;
&resources;
&validation;
&expressions;
&aop;
&aop-api;
&testing;
<xi:include href="beans.xml"/>
<xi:include href="resources.xml"/>
<xi:include href="validation.xml"/>
<xi:include href="expressions.xml"/>
<xi:include href="aop.xml"/>
<xi:include href="aop-api.xml"/>
<xi:include href="testing.xml"/>
</part>
<part id="spring-data-tier">
<title>Data Access</title>
@ -255,11 +219,11 @@
</listitem>
</itemizedlist>
</partintro>
&transaction;
&dao;
&jdbc;
&orm;
&oxm;
<xi:include href="transaction.xml"/>
<xi:include href="dao.xml"/>
<xi:include href="jdbc.xml"/>
<xi:include href="orm.xml"/>
<xi:include href="oxm.xml"/>
</part>
<part id="spring-web">
<title>The Web</title>
@ -300,11 +264,11 @@
</listitem>
</itemizedlist>
</partintro>
&mvc;
&view;
&rest;
&web-integration;
&portlet;
<xi:include href="mvc.xml"/>
<xi:include href="view.xml"/>
<xi:include href="rest.xml"/>
<xi:include href="web-integration.xml"/>
<xi:include href="portlet.xml"/>
</part>
<part id="spring-integration">
<title>Integration</title>
@ -344,20 +308,20 @@
</listitem>
</itemizedlist>
</partintro>
&remoting;
&ejb;
&jms;
&jmx;
&cci;
&mail;
&scheduling;
&dynamic-languages;
&metadata;
<xi:include href="remoting.xml"/>
<xi:include href="ejb.xml"/>
<xi:include href="jms.xml"/>
<xi:include href="jmx.xml"/>
<xi:include href="cci.xml"/>
<xi:include href="mail.xml"/>
<xi:include href="scheduling.xml"/>
<xi:include href="dynamic-languages.xml"/>
<xi:include href="metadata.xml"/>
</part>
<!-- back matter -->
&xsd-configuration;
&xml-custom;
&dtd;
&spring-tld;
&spring-form-tld;
<xi:include href="xsd-configuration.xml"/>
<xi:include href="xml-custom.xml"/>
<xi:include href="dtd.xml"/>
<xi:include href="spring.tld.xml"/>
<xi:include href="spring-form.tld.xml"/>
</book>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="spring.tld">
<title>spring.tld</title>
<section id="spring.tld-intro">

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<sidebar>
<title>Spring Web Flow</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="testing">
<title>Testing</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="transaction">
<title>Transaction management</title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="validation">
<title>Validation, Data-binding, the <interfacename>BeanWrapper</interfacename>, and <literal>PropertyEditors</literal></title>

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="view">
<title>View technologies</title>

View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<chapter id="web-integration">
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="web-integration" xmlns:xi="http://www.w3.org/2001/XInclude">
<title>Integrating with other web frameworks</title>
<section id="intro">
@ -13,7 +16,7 @@
</para>
<!-- insert some content about Spring Web Flow here -->
&swf-sidebar;
<xi:include href="swf-sidebar.xml"/>
<para>
One of the core value propositions of the Spring Framework is that of

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="extensible-xml">
<title>Extensible XML authoring</title>
<section id="extensible-xml-introduction">

View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="xsd-config">
<title>XML Schema-based configuration</title>
<section id="xsd-config-introduction">

View File

@ -89,16 +89,7 @@
<option name="XML_KEEP_WHITESPACES" value="true" />
<option name="XML_TEXT_WRAP" value="0" />
<ADDITIONAL_INDENT_OPTIONS fileType="">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="gsp">
<option name="INDENT_SIZE" value="2" />
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
@ -115,17 +106,8 @@
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="js">
<option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
<ADDITIONAL_INDENT_OPTIONS fileType="jsp">
<option name="INDENT_SIZE" value="4" />
<ADDITIONAL_INDENT_OPTIONS fileType="sql">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
@ -636,6 +618,9 @@
<option name="projectName" value="spring-framework" />
</component>
<component name="ProjectFileVersion" converted="true" />
<component name="ProjectKey">
<option name="state" value="https://src.springframework.org/svn/spring-framework/trunk/spring-framework.ipr" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/org.springframework.aop/aop.iml" filepath="$PROJECT_DIR$/org.springframework.aop/aop.iml" />
@ -694,6 +679,7 @@
</map>
</option>
<option name="myVersion" value="124" />
<option name="mySupportsUserInfoFilter" value="true" />
</component>
<component name="SvnChangesBrowserSettings">
<option name="USE_AUTHOR_FIELD" value="true" />