From 62e94461f413d074dbb51e8ff8ee21a262257efe Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 25 Jan 2012 13:11:43 +0100 Subject: [PATCH] Move reference docs => src/reference This change eliminates the spring-framework-reference subproject, moving these sources into the root project's own src directory. This makes sense because the reference docs span all submodules, and also because api Javadoc is created at the root project level as well. This means that both api and reference documentation output will now reside in the root project's 'build' directory. This is more consistent and easy to discover. --- spring-framework-reference/build.xml | 9 - .../css/html/highlight.css | 35 -- .../css/html/stylesheet.css | 99 ---- spring-framework-reference/ivy.xml | 25 - spring-framework-reference/src/images | 1 - .../styles/html/custom.xsl | 136 ----- .../styles/html/titlepage.xml | 61 --- .../styles/pdf/custom.xsl | 518 ------------------ .../styles/pdf/titlepage.xml | 101 ---- .../src => src/reference/docbook}/aop-api.xml | 0 .../src => src/reference/docbook}/aop.xml | 0 .../docbook}/beans-annotation-config.xml | 0 .../docbook}/beans-classpath-scanning.xml | 0 .../docbook}/beans-context-additional.xml | 0 .../reference/docbook}/beans-customizing.xml | 0 .../reference/docbook}/beans-dependencies.xml | 0 .../docbook}/beans-extension-points.xml | 0 .../reference/docbook}/beans-java.xml | 0 .../reference/docbook}/beans-scopes.xml | 0 .../docbook}/beans-standard-annotations.xml | 0 .../src => src/reference/docbook}/beans.xml | 0 .../src => src/reference/docbook}/cache.xml | 0 .../src => src/reference/docbook}/cci.xml | 0 .../reference/docbook}/classic-aop-spring.xml | 0 .../reference/docbook}/classic-spring.xml | 0 .../src => src/reference/docbook}/dao.xml | 0 .../src => src/reference/docbook}/dtd.xml | 0 .../reference/docbook}/dynamic-languages.xml | 0 .../src => src/reference/docbook}/ejb.xml | 0 .../reference/docbook}/expressions.xml | 0 .../docbook}/images/DataAccessException.gif | Bin .../docbook}/images/aop-proxy-call.png | Bin .../images/aop-proxy-plain-pojo-call.png | Bin .../reference/docbook}/images/aop-uml.gif | Bin .../reference/docbook}/images/banner4.jpg | Bin .../images/bean-lifecycle-overview.gif | Bin .../reference/docbook}/images/bind1.jpg | Bin .../reference/docbook}/images/bind2.jpg | Bin .../docbook}/images/container-magic.png | Bin .../docbook}/images/eclipse-setup-1.png | Bin .../docbook}/images/eclipse-setup-2.png | Bin .../docbook}/images/eclipse-setup-3.png | Bin .../reference/docbook}/images/ejb.gif | Bin .../reference/docbook}/images/ejb.png | Bin .../reference/docbook}/images/ejb.svg | 0 .../reference/docbook}/images/full.gif | Bin .../reference/docbook}/images/full.png | Bin .../reference/docbook}/images/full.svg | 0 .../reference/docbook}/images/html-logo.png | Bin .../docbook}/images/idea-setup-1.png | Bin .../docbook}/images/idea-setup-2.png | Bin .../docbook}/images/idea-setup-3.png | Bin .../docbook}/images/idea-setup-4.png | Bin .../docbook}/images/idea-setup-5.png | Bin .../docbook}/images/idea-setup-6.png | Bin .../reference/docbook}/images/logo-pdf.png | Bin .../reference/docbook}/images/logo.gif | Bin .../reference/docbook}/images/logo.jpg | Bin .../reference/docbook}/images/logo.psd | Bin .../reference/docbook}/images/logo.xcf | Bin .../docbook}/images/mvc-contexts.gif | Bin .../reference/docbook}/images/mvc.png | Bin .../reference/docbook}/images/note.gif | Bin .../reference/docbook}/images/note.png | Bin .../docbook}/images/overview-ejb.graffle | 0 .../docbook}/images/overview-ejb.png | Bin .../docbook}/images/overview-full.graffle | 0 .../docbook}/images/overview-full.png | Bin .../docbook}/images/overview-remoting.graffle | 0 .../docbook}/images/overview-remoting.png | Bin .../images/overview-thirdparty-web.graffle | 0 .../images/overview-thirdparty-web.png | Bin .../docbook}/images/oxm-exceptions.graffle | 0 .../docbook}/images/oxm-exceptions.png | Bin .../reference/docbook}/images/pdf-logo.png | Bin .../reference/docbook}/images/prototype.png | Bin .../reference/docbook}/images/remoting.gif | Bin .../reference/docbook}/images/remoting.png | Bin .../reference/docbook}/images/remoting.svg | 0 .../reference/docbook}/images/singleton.png | Bin .../docbook}/images/spring-overview.gif | Bin .../docbook}/images/spring-overview.graffle | 0 .../docbook}/images/spring-overview.png | Bin .../docbook}/images/spring-overview.svg | 0 .../docbook}/images/spring-overview.vsd | Bin .../reference/docbook}/images/spring.sxd | Bin .../images/springsource-banner-rhs.png | Bin .../docbook}/images/thirdparty-web.gif | Bin .../docbook}/images/thirdparty-web.png | Bin .../docbook}/images/thirdparty-web.svg | 0 .../reference/docbook}/images/tx.png | Bin .../docbook}/images/tx_prop_required.png | Bin .../docbook}/images/tx_prop_requires_new.png | Bin .../docbook}/images/xdev-spring_logo.jpg | Bin .../reference/docbook/index.xml | 0 .../src => src/reference/docbook}/jdbc.xml | 0 .../src => src/reference/docbook}/jms.xml | 0 .../src => src/reference/docbook}/jmx.xml | 0 .../src => src/reference/docbook}/mail.xml | 0 .../src => src/reference/docbook}/mvc.xml | 0 .../reference/docbook}/new-in-3.0.xml | 0 .../reference/docbook}/new-in-3.1.xml | 0 .../src => src/reference/docbook}/orm.xml | 0 .../reference/docbook}/overview.xml | 0 .../src => src/reference/docbook}/oxm.xml | 0 .../src => src/reference/docbook}/portlet.xml | 0 .../src => src/reference/docbook}/preface.xml | 0 .../reference/docbook}/remoting.xml | 0 .../reference/docbook}/resources.xml | 0 .../reference/docbook}/scheduling.xml | 0 .../reference/docbook}/spring-form.tld.xml | 0 .../reference/docbook}/spring.tld.xml | 0 .../reference/docbook}/swf-sidebar.xml | 0 .../src => src/reference/docbook}/testing.xml | 0 .../reference/docbook}/transaction.xml | 0 .../reference/docbook}/validation.xml | 0 .../src => src/reference/docbook}/view.xml | 0 .../reference/docbook}/web-integration.xml | 0 .../reference/docbook}/xml-custom.xml | 0 .../reference/docbook}/xsd-configuration.xml | 0 120 files changed, 985 deletions(-) delete mode 100644 spring-framework-reference/build.xml delete mode 100644 spring-framework-reference/css/html/highlight.css delete mode 100644 spring-framework-reference/css/html/stylesheet.css delete mode 100644 spring-framework-reference/ivy.xml delete mode 120000 spring-framework-reference/src/images delete mode 100644 spring-framework-reference/styles/html/custom.xsl delete mode 100644 spring-framework-reference/styles/html/titlepage.xml delete mode 100644 spring-framework-reference/styles/pdf/custom.xsl delete mode 100644 spring-framework-reference/styles/pdf/titlepage.xml rename {spring-framework-reference/src => src/reference/docbook}/aop-api.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/aop.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-annotation-config.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-classpath-scanning.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-context-additional.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-customizing.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-dependencies.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-extension-points.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-java.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-scopes.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans-standard-annotations.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/beans.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/cache.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/cci.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/classic-aop-spring.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/classic-spring.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/dao.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/dtd.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/dynamic-languages.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/ejb.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/expressions.xml (100%) rename {spring-framework-reference => src/reference/docbook}/images/DataAccessException.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/aop-proxy-call.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/aop-proxy-plain-pojo-call.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/aop-uml.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/banner4.jpg (100%) rename {spring-framework-reference => src/reference/docbook}/images/bean-lifecycle-overview.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/bind1.jpg (100%) rename {spring-framework-reference => src/reference/docbook}/images/bind2.jpg (100%) rename {spring-framework-reference => src/reference/docbook}/images/container-magic.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/eclipse-setup-1.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/eclipse-setup-2.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/eclipse-setup-3.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/ejb.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/ejb.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/ejb.svg (100%) rename {spring-framework-reference => src/reference/docbook}/images/full.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/full.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/full.svg (100%) rename {spring-framework-reference => src/reference/docbook}/images/html-logo.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/idea-setup-1.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/idea-setup-2.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/idea-setup-3.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/idea-setup-4.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/idea-setup-5.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/idea-setup-6.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/logo-pdf.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/logo.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/logo.jpg (100%) rename {spring-framework-reference => src/reference/docbook}/images/logo.psd (100%) rename {spring-framework-reference => src/reference/docbook}/images/logo.xcf (100%) rename {spring-framework-reference => src/reference/docbook}/images/mvc-contexts.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/mvc.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/note.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/note.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/overview-ejb.graffle (100%) rename {spring-framework-reference => src/reference/docbook}/images/overview-ejb.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/overview-full.graffle (100%) rename {spring-framework-reference => src/reference/docbook}/images/overview-full.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/overview-remoting.graffle (100%) rename {spring-framework-reference => src/reference/docbook}/images/overview-remoting.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/overview-thirdparty-web.graffle (100%) rename {spring-framework-reference => src/reference/docbook}/images/overview-thirdparty-web.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/oxm-exceptions.graffle (100%) rename {spring-framework-reference => src/reference/docbook}/images/oxm-exceptions.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/pdf-logo.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/prototype.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/remoting.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/remoting.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/remoting.svg (100%) rename {spring-framework-reference => src/reference/docbook}/images/singleton.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/spring-overview.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/spring-overview.graffle (100%) rename {spring-framework-reference => src/reference/docbook}/images/spring-overview.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/spring-overview.svg (100%) rename {spring-framework-reference => src/reference/docbook}/images/spring-overview.vsd (100%) rename {spring-framework-reference => src/reference/docbook}/images/spring.sxd (100%) rename {spring-framework-reference => src/reference/docbook}/images/springsource-banner-rhs.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/thirdparty-web.gif (100%) rename {spring-framework-reference => src/reference/docbook}/images/thirdparty-web.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/thirdparty-web.svg (100%) rename {spring-framework-reference => src/reference/docbook}/images/tx.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/tx_prop_required.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/tx_prop_requires_new.png (100%) rename {spring-framework-reference => src/reference/docbook}/images/xdev-spring_logo.jpg (100%) rename spring-framework-reference/src/spring-framework-reference.xml => src/reference/docbook/index.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/jdbc.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/jms.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/jmx.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/mail.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/mvc.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/new-in-3.0.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/new-in-3.1.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/orm.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/overview.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/oxm.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/portlet.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/preface.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/remoting.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/resources.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/scheduling.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/spring-form.tld.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/spring.tld.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/swf-sidebar.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/testing.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/transaction.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/validation.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/view.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/web-integration.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/xml-custom.xml (100%) rename {spring-framework-reference/src => src/reference/docbook}/xsd-configuration.xml (100%) diff --git a/spring-framework-reference/build.xml b/spring-framework-reference/build.xml deleted file mode 100644 index 46d851c172..0000000000 --- a/spring-framework-reference/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/spring-framework-reference/css/html/highlight.css b/spring-framework-reference/css/html/highlight.css deleted file mode 100644 index ffefef72de..0000000000 --- a/spring-framework-reference/css/html/highlight.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - code highlight CSS resemblign the Eclipse IDE default color schema - @author Costin Leau -*/ - -.hl-keyword { - color: #7F0055; - font-weight: bold; -} - -.hl-comment { - color: #3F5F5F; - font-style: italic; -} - -.hl-multiline-comment { - color: #3F5FBF; - font-style: italic; -} - -.hl-tag { - color: #3F7F7F; -} - -.hl-attribute { - color: #7F007F; -} - -.hl-value { - color: #2A00FF; -} - -.hl-string { - color: #2A00FF; -} \ No newline at end of file diff --git a/spring-framework-reference/css/html/stylesheet.css b/spring-framework-reference/css/html/stylesheet.css deleted file mode 100644 index 77569070a9..0000000000 --- a/spring-framework-reference/css/html/stylesheet.css +++ /dev/null @@ -1,99 +0,0 @@ -@IMPORT url("highlight.css"); - -html { - padding: 0pt; - margin: 0pt; -} - -body { - margin-left: 10%; - margin-right: 10%; - font-family: Arial, Sans-serif; -} - -div { - margin: 0pt; -} - -p { - text-align: justify; -} - -hr { - border: 1px solid gray; - background: gray; -} - -h1,h2,h3,h4 { - color: #234623; - font-family: Arial, Sans-serif; -} - -pre { - line-height: 1.0; - color: black; -} - -pre.programlisting { - font-size: 10pt; - padding: 7pt 3pt; - border: 1pt solid black; - background: #eeeeee; - clear: both; -} - -div.table { - margin: 1em; - padding: 0.5em; - text-align: center; -} - -div.table table { - display: table; - width: 100%; -} - -div.table td { - padding-left: 7px; - padding-right: 7px; -} - -.sidebar { - float: right; - margin: 10px 0 10px 30px; - padding: 10px 20px 20px 20px; - width: 33%; - border: 1px solid black; - background-color: #F4F4F4; - font-size: 14px; -} - -.mediaobject { - padding-top: 30px; - padding-bottom: 30px; -} - -.legalnotice { - font-family: Verdana, Arial, helvetica, sans-serif; - font-size: 12px; - font-style: italic; -} - -p.releaseinfo { - font-size: 100%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; - padding-top: 10px; -} - -p.pubdate { - font-size: 120%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -span.productname { - font-size: 200%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; -} diff --git a/spring-framework-reference/ivy.xml b/spring-framework-reference/ivy.xml deleted file mode 100644 index 6f31e06f57..0000000000 --- a/spring-framework-reference/ivy.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-framework-reference/src/images b/spring-framework-reference/src/images deleted file mode 120000 index 5e67573196..0000000000 --- a/spring-framework-reference/src/images +++ /dev/null @@ -1 +0,0 @@ -../images \ No newline at end of file diff --git a/spring-framework-reference/styles/html/custom.xsl b/spring-framework-reference/styles/html/custom.xsl deleted file mode 100644 index 81e6ab2358..0000000000 --- a/spring-framework-reference/styles/html/custom.xsl +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - '5' - - - - 1 - 0 - 1 - - - - images/ - .gif - - 120 - images/callouts/ - .gif - - - css/stylesheet.css - text/css - book toc,title - - text-align: left - - - - - - - - - - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Begin Google Analytics code - - - End Google Analytics code - - - - - Begin LoopFuse code - - - End LoopFuse code - - - \ No newline at end of file diff --git a/spring-framework-reference/styles/html/titlepage.xml b/spring-framework-reference/styles/html/titlepage.xml deleted file mode 100644 index 09539c068c..0000000000 --- a/spring-framework-reference/styles/html/titlepage.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - <subtitle/> - <!-- <corpauthor/> - <authorgroup/> - <author/> - <mediaobject/> --> - <othercredit/> - <releaseinfo/> - <copyright/> - <legalnotice/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - <hr/> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -</t:templates> diff --git a/spring-framework-reference/styles/pdf/custom.xsl b/spring-framework-reference/styles/pdf/custom.xsl deleted file mode 100644 index 2905ee3c21..0000000000 --- a/spring-framework-reference/styles/pdf/custom.xsl +++ /dev/null @@ -1,518 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> - -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:xslthl="http://xslthl.sf.net" - exclude-result-prefixes="xslthl" - version='1.0'> - -<!-- Use nice graphics for admonitions --> - <xsl:param name="admon.graphics">'1'</xsl:param> - <xsl:param name="admon.graphics.path">@file.prefix@@dbf.xsl@/images/</xsl:param> - <xsl:param name="draft.watermark.image" select="'@file.prefix@@dbf.xsl@/images/draft.png'"/> - <xsl:param name="paper.type" select="'@paper.type@'"/> - - <xsl:param name="page.margin.top" select="'1cm'"/> - <xsl:param name="region.before.extent" select="'1cm'"/> - <xsl:param name="body.margin.top" select="'1.5cm'"/> - - <xsl:param name="body.margin.bottom" select="'1.5cm'"/> - <xsl:param name="region.after.extent" select="'1cm'"/> - <xsl:param name="page.margin.bottom" select="'1cm'"/> - <xsl:param name="title.margin.left" select="'0cm'"/> - -<!--################################################### - Header - ################################################### --> - -<!-- More space in the center header for long text --> - <xsl:attribute-set name="header.content.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.font.family"/> - </xsl:attribute> - <xsl:attribute name="margin-left">-5em</xsl:attribute> - <xsl:attribute name="margin-right">-5em</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Table of Contents - ################################################### --> - - <xsl:param name="generate.toc"> - book toc,title - </xsl:param> - -<!--################################################### - Custom Header - ################################################### --> - - <xsl:template name="header.content"> - <xsl:param name="pageclass" select="''"/> - <xsl:param name="sequence" select="''"/> - <xsl:param name="position" select="''"/> - <xsl:param name="gentext-key" select="''"/> - - <xsl:variable name="Version"> - <xsl:choose> - <xsl:when test="//productname"> - <xsl:value-of select="//productname"/><xsl:text> </xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>please define productname in your docbook file!</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$sequence='blank'"> - <xsl:choose> - <xsl:when test="$position='center'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$pageclass='titlepage'"> - <!-- nop: other titlepage sequences have no header --> - </xsl:when> - - <xsl:when test="$position='center'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -<!--################################################### - Custom Footer - ################################################### --> - - <xsl:template name="footer.content"> - <xsl:param name="pageclass" select="''"/> - <xsl:param name="sequence" select="''"/> - <xsl:param name="position" select="''"/> - <xsl:param name="gentext-key" select="''"/> - - <xsl:variable name="Version"> - <xsl:choose> - <xsl:when test="//releaseinfo"> - <xsl:value-of select="//releaseinfo"/> - </xsl:when> - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="Title"> - <xsl:value-of select="//title"/> - </xsl:variable> - - <xsl:choose> - <xsl:when test="$sequence='blank'"> - <xsl:choose> - <xsl:when test="$double.sided != 0 and $position = 'left'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:when test="$double.sided = 0 and $position = 'center'"> - <!-- nop --> - </xsl:when> - - <xsl:otherwise> - <fo:page-number/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - - <xsl:when test="$pageclass='titlepage'"> - <!-- nop: other titlepage sequences have no footer --> - </xsl:when> - - <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'"> - <fo:page-number/> - </xsl:when> - - <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'"> - <fo:page-number/> - </xsl:when> - - <xsl:when test="$double.sided = 0 and $position='right'"> - <fo:page-number/> - </xsl:when> - - <xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:when test="$double.sided = 0 and $position='left'"> - <xsl:value-of select="$Version"/> - </xsl:when> - - <xsl:when test="$position='center'"> - <xsl:value-of select="$Title"/> - </xsl:when> - - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template match="processing-instruction('hard-pagebreak')"> - <fo:block break-before='page'/> - </xsl:template> - -<!--################################################### - Extensions - ################################################### --> - -<!-- These extensions are required for table printing and other stuff --> - <xsl:param name="use.extensions">1</xsl:param> - <xsl:param name="tablecolumns.extension">0</xsl:param> - <xsl:param name="callout.extensions">1</xsl:param> - <xsl:param name="fop.extensions">1</xsl:param> - -<!--################################################### - Paper & Page Size - ################################################### --> - -<!-- Paper type, no headers on blank pages, no double sided printing --> - <xsl:param name="double.sided">0</xsl:param> - <xsl:param name="headers.on.blank.pages">0</xsl:param> - <xsl:param name="footers.on.blank.pages">0</xsl:param> - -<!--################################################### - Fonts & Styles - ################################################### --> - - <xsl:param name="hyphenate">false</xsl:param> - -<!-- Default Font size --> - <xsl:param name="body.font.master">11</xsl:param> - <xsl:param name="body.font.small">8</xsl:param> - -<!-- Line height in body text --> - <xsl:param name="line-height">1.4</xsl:param> - -<!-- Chapter title size --> - <xsl:attribute-set name="chapter.titlepage.recto.style"> - <xsl:attribute name="text-align">left</xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.8"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - </xsl:attribute-set> - -<!-- Why is the font-size for chapters hardcoded in the XSL FO templates? - Let's remove it, so this sucker can use our attribute-set only... --> - <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" - xsl:use-attribute-sets="chapter.titlepage.recto.style"> - <xsl:call-template name="component.title"> - <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/> - </xsl:call-template> - </fo:block> - </xsl:template> - -<!-- Sections 1, 2 and 3 titles have a small bump factor and padding --> - <xsl:attribute-set name="section.title.level1.properties"> - <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.5"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - <xsl:attribute-set name="section.title.level2.properties"> - <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.25"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - <xsl:attribute-set name="section.title.level3.properties"> - <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.0"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - <xsl:attribute-set name="section.title.level4.properties"> - <xsl:attribute name="space-before.optimum">0.3em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.3em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.3em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 0.9"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - -<!-- Use code syntax highlighting --> - <xsl:param name="highlight.source" select="1"/> - <xsl:param name="highlight.default.language" select="xml" /> - - <xsl:template match='xslthl:keyword'> - <fo:inline font-weight="bold" color="#7F0055"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:comment'> - <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:oneline-comment'> - <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:multiline-comment'> - <fo:inline font-style="italic" color="#3F5FBF"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:tag'> - <fo:inline color="#3F7F7F"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:attribute'> - <fo:inline color="#7F007F"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:value'> - <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:string'> - <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline> - </xsl:template> - -<!--################################################### - Tables - ################################################### --> - - <!-- Some padding inside tables --> - <xsl:attribute-set name="table.cell.padding"> - <xsl:attribute name="padding-left">4pt</xsl:attribute> - <xsl:attribute name="padding-right">4pt</xsl:attribute> - <xsl:attribute name="padding-top">4pt</xsl:attribute> - <xsl:attribute name="padding-bottom">4pt</xsl:attribute> - </xsl:attribute-set> - -<!-- Only hairlines as frame and cell borders in tables --> - <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param> - <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param> - -<!--################################################### - Labels - ################################################### --> - -<!-- Label Chapters and Sections (numbering) --> - <xsl:param name="chapter.autolabel" select="1"/> - <xsl:param name="section.autolabel" select="1"/> - <xsl:param name="section.autolabel.max.depth" select="1"/> - - <xsl:param name="section.label.includes.component.label" select="1"/> - <xsl:param name="table.footnote.number.format" select="'1'"/> - -<!--################################################### - Programlistings - ################################################### --> - -<!-- Verbatim text formatting (programlistings) --> - <xsl:attribute-set name="monospace.verbatim.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.small * 1.0"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="verbatim.properties"> - <xsl:attribute name="space-before.minimum">1em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - - <xsl:attribute name="border-color">#444444</xsl:attribute> - <xsl:attribute name="border-style">solid</xsl:attribute> - <xsl:attribute name="border-width">0.1pt</xsl:attribute> - <xsl:attribute name="padding-top">0.5em</xsl:attribute> - <xsl:attribute name="padding-left">0.5em</xsl:attribute> - <xsl:attribute name="padding-right">0.5em</xsl:attribute> - <xsl:attribute name="padding-bottom">0.5em</xsl:attribute> - <xsl:attribute name="margin-left">0.5em</xsl:attribute> - <xsl:attribute name="margin-right">0.5em</xsl:attribute> - </xsl:attribute-set> - - <!-- Shade (background) programlistings --> - <xsl:param name="shade.verbatim">1</xsl:param> - <xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="background-color">#F0F0F0</xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="list.block.spacing"> - <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="example.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Title information for Figures, Examples etc. - ################################################### --> - - <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing"> - <xsl:attribute name="font-weight">normal</xsl:attribute> - <xsl:attribute name="font-style">italic</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Callouts - ################################################### --> - -<!-- don't use images for callouts --> - <xsl:param name="callout.graphics">0</xsl:param> - <xsl:param name="callout.unicode">1</xsl:param> - -<!-- Place callout marks at this column in annotated areas --> - <xsl:param name="callout.defaultcolumn">90</xsl:param> - -<!--################################################### - Misc - ################################################### --> - -<!-- Placement of titles --> - <xsl:param name="formal.title.placement"> - figure after - example after - equation before - table before - procedure before - </xsl:param> - -<!-- Format Variable Lists as Blocks (prevents horizontal overflow) --> - <xsl:param name="variablelist.as.blocks">1</xsl:param> - - <xsl:param name="body.start.indent">0pt</xsl:param> - -<!-- Show only Sections up to level 3 in the TOCs --> - <xsl:param name="toc.section.depth">3</xsl:param> - -<!-- Remove "Chapter" from the Chapter titles... --> - <xsl:param name="local.l10n.xml" select="document('')"/> - <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> - <l:l10n language="en"> - <l:context name="title-numbered"> - <l:template name="chapter" text="%n. %t"/> - <l:template name="section" text="%n %t"/> - </l:context> - <l:context name="title"> - <l:template name="example" text="Example %n %t"/> - </l:context> - </l:l10n> - </l:i18n> - -<!--################################################### - colored and hyphenated links - ################################################### --> - - <xsl:template match="ulink"> - <fo:basic-link external-destination="{@url}" - xsl:use-attribute-sets="xref.properties" - text-decoration="underline" - color="blue"> - <xsl:choose> - <xsl:when test="count(child::node())=0"> - <xsl:value-of select="@url"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> - </xsl:template> - - <xsl:template match="link"> - <fo:basic-link internal-destination="{@linkend}" - xsl:use-attribute-sets="xref.properties" - text-decoration="underline" - color="blue"> - <xsl:choose> - <xsl:when test="count(child::node())=0"> - <xsl:value-of select="@linkend"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> - </xsl:template> - -</xsl:stylesheet> \ No newline at end of file diff --git a/spring-framework-reference/styles/pdf/titlepage.xml b/spring-framework-reference/styles/pdf/titlepage.xml deleted file mode 100644 index dc18e1e0de..0000000000 --- a/spring-framework-reference/styles/pdf/titlepage.xml +++ /dev/null @@ -1,101 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> - -<!DOCTYPE t:templates [ -<!ENTITY hsize0 "10pt"> -<!ENTITY hsize1 "12pt"> -<!ENTITY hsize2 "14.4pt"> -<!ENTITY hsize3 "17.28pt"> -<!ENTITY hsize4 "20.736pt"> -<!ENTITY hsize5 "24.8832pt"> -<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 --> -<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 --> -<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 --> -<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 --> -<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 --> -<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 --> -]> -<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0" - xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param" - xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <t:titlepage t:element="book" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="division.title" - param:node="ancestor-or-self::book[1]" - text-align="center" - font-size="&hsize5;" - space-before="&hsize5space;" - font-weight="bold" - font-family="{$title.fontset}"/> - <subtitle - text-align="center" - font-size="&hsize4;" - space-before="&hsize4space;" - font-family="{$title.fontset}"/> - - <!-- <corpauthor space-before="0.5em" - font-size="&hsize2;"/> - <authorgroup space-before="0.5em" - font-size="&hsize2;"/> - <author space-before="0.5em" - font-size="&hsize2;"/> --> - - <mediaobject space-before="2em" space-after="2em"/> - <releaseinfo space-before="5em" font-size="&hsize2;"/> - <copyright space-before="1.5em" - font-weight="normal" - font-size="8"/> - <legalnotice space-before="5em" - font-weight="normal" - font-style="italic" - font-size="8"/> - <othercredit space-before="2em" - font-weight="normal" - font-size="8"/> - <pubdate space-before="0.5em"/> - <revision space-before="0.5em"/> - <revhistory space-before="0.5em"/> - <abstract space-before="0.5em" - text-align="start" - margin-left="0.5in" - margin-right="0.5in" - font-family="{$body.fontset}"/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -<!-- ==================================================================== --> - -</t:templates> diff --git a/spring-framework-reference/src/aop-api.xml b/src/reference/docbook/aop-api.xml similarity index 100% rename from spring-framework-reference/src/aop-api.xml rename to src/reference/docbook/aop-api.xml diff --git a/spring-framework-reference/src/aop.xml b/src/reference/docbook/aop.xml similarity index 100% rename from spring-framework-reference/src/aop.xml rename to src/reference/docbook/aop.xml diff --git a/spring-framework-reference/src/beans-annotation-config.xml b/src/reference/docbook/beans-annotation-config.xml similarity index 100% rename from spring-framework-reference/src/beans-annotation-config.xml rename to src/reference/docbook/beans-annotation-config.xml diff --git a/spring-framework-reference/src/beans-classpath-scanning.xml b/src/reference/docbook/beans-classpath-scanning.xml similarity index 100% rename from spring-framework-reference/src/beans-classpath-scanning.xml rename to src/reference/docbook/beans-classpath-scanning.xml diff --git a/spring-framework-reference/src/beans-context-additional.xml b/src/reference/docbook/beans-context-additional.xml similarity index 100% rename from spring-framework-reference/src/beans-context-additional.xml rename to src/reference/docbook/beans-context-additional.xml diff --git a/spring-framework-reference/src/beans-customizing.xml b/src/reference/docbook/beans-customizing.xml similarity index 100% rename from spring-framework-reference/src/beans-customizing.xml rename to src/reference/docbook/beans-customizing.xml diff --git a/spring-framework-reference/src/beans-dependencies.xml b/src/reference/docbook/beans-dependencies.xml similarity index 100% rename from spring-framework-reference/src/beans-dependencies.xml rename to src/reference/docbook/beans-dependencies.xml diff --git a/spring-framework-reference/src/beans-extension-points.xml b/src/reference/docbook/beans-extension-points.xml similarity index 100% rename from spring-framework-reference/src/beans-extension-points.xml rename to src/reference/docbook/beans-extension-points.xml diff --git a/spring-framework-reference/src/beans-java.xml b/src/reference/docbook/beans-java.xml similarity index 100% rename from spring-framework-reference/src/beans-java.xml rename to src/reference/docbook/beans-java.xml diff --git a/spring-framework-reference/src/beans-scopes.xml b/src/reference/docbook/beans-scopes.xml similarity index 100% rename from spring-framework-reference/src/beans-scopes.xml rename to src/reference/docbook/beans-scopes.xml diff --git a/spring-framework-reference/src/beans-standard-annotations.xml b/src/reference/docbook/beans-standard-annotations.xml similarity index 100% rename from spring-framework-reference/src/beans-standard-annotations.xml rename to src/reference/docbook/beans-standard-annotations.xml diff --git a/spring-framework-reference/src/beans.xml b/src/reference/docbook/beans.xml similarity index 100% rename from spring-framework-reference/src/beans.xml rename to src/reference/docbook/beans.xml diff --git a/spring-framework-reference/src/cache.xml b/src/reference/docbook/cache.xml similarity index 100% rename from spring-framework-reference/src/cache.xml rename to src/reference/docbook/cache.xml diff --git a/spring-framework-reference/src/cci.xml b/src/reference/docbook/cci.xml similarity index 100% rename from spring-framework-reference/src/cci.xml rename to src/reference/docbook/cci.xml diff --git a/spring-framework-reference/src/classic-aop-spring.xml b/src/reference/docbook/classic-aop-spring.xml similarity index 100% rename from spring-framework-reference/src/classic-aop-spring.xml rename to src/reference/docbook/classic-aop-spring.xml diff --git a/spring-framework-reference/src/classic-spring.xml b/src/reference/docbook/classic-spring.xml similarity index 100% rename from spring-framework-reference/src/classic-spring.xml rename to src/reference/docbook/classic-spring.xml diff --git a/spring-framework-reference/src/dao.xml b/src/reference/docbook/dao.xml similarity index 100% rename from spring-framework-reference/src/dao.xml rename to src/reference/docbook/dao.xml diff --git a/spring-framework-reference/src/dtd.xml b/src/reference/docbook/dtd.xml similarity index 100% rename from spring-framework-reference/src/dtd.xml rename to src/reference/docbook/dtd.xml diff --git a/spring-framework-reference/src/dynamic-languages.xml b/src/reference/docbook/dynamic-languages.xml similarity index 100% rename from spring-framework-reference/src/dynamic-languages.xml rename to src/reference/docbook/dynamic-languages.xml diff --git a/spring-framework-reference/src/ejb.xml b/src/reference/docbook/ejb.xml similarity index 100% rename from spring-framework-reference/src/ejb.xml rename to src/reference/docbook/ejb.xml diff --git a/spring-framework-reference/src/expressions.xml b/src/reference/docbook/expressions.xml similarity index 100% rename from spring-framework-reference/src/expressions.xml rename to src/reference/docbook/expressions.xml diff --git a/spring-framework-reference/images/DataAccessException.gif b/src/reference/docbook/images/DataAccessException.gif similarity index 100% rename from spring-framework-reference/images/DataAccessException.gif rename to src/reference/docbook/images/DataAccessException.gif diff --git a/spring-framework-reference/images/aop-proxy-call.png b/src/reference/docbook/images/aop-proxy-call.png similarity index 100% rename from spring-framework-reference/images/aop-proxy-call.png rename to src/reference/docbook/images/aop-proxy-call.png diff --git a/spring-framework-reference/images/aop-proxy-plain-pojo-call.png b/src/reference/docbook/images/aop-proxy-plain-pojo-call.png similarity index 100% rename from spring-framework-reference/images/aop-proxy-plain-pojo-call.png rename to src/reference/docbook/images/aop-proxy-plain-pojo-call.png diff --git a/spring-framework-reference/images/aop-uml.gif b/src/reference/docbook/images/aop-uml.gif similarity index 100% rename from spring-framework-reference/images/aop-uml.gif rename to src/reference/docbook/images/aop-uml.gif diff --git a/spring-framework-reference/images/banner4.jpg b/src/reference/docbook/images/banner4.jpg similarity index 100% rename from spring-framework-reference/images/banner4.jpg rename to src/reference/docbook/images/banner4.jpg diff --git a/spring-framework-reference/images/bean-lifecycle-overview.gif b/src/reference/docbook/images/bean-lifecycle-overview.gif similarity index 100% rename from spring-framework-reference/images/bean-lifecycle-overview.gif rename to src/reference/docbook/images/bean-lifecycle-overview.gif diff --git a/spring-framework-reference/images/bind1.jpg b/src/reference/docbook/images/bind1.jpg similarity index 100% rename from spring-framework-reference/images/bind1.jpg rename to src/reference/docbook/images/bind1.jpg diff --git a/spring-framework-reference/images/bind2.jpg b/src/reference/docbook/images/bind2.jpg similarity index 100% rename from spring-framework-reference/images/bind2.jpg rename to src/reference/docbook/images/bind2.jpg diff --git a/spring-framework-reference/images/container-magic.png b/src/reference/docbook/images/container-magic.png similarity index 100% rename from spring-framework-reference/images/container-magic.png rename to src/reference/docbook/images/container-magic.png diff --git a/spring-framework-reference/images/eclipse-setup-1.png b/src/reference/docbook/images/eclipse-setup-1.png similarity index 100% rename from spring-framework-reference/images/eclipse-setup-1.png rename to src/reference/docbook/images/eclipse-setup-1.png diff --git a/spring-framework-reference/images/eclipse-setup-2.png b/src/reference/docbook/images/eclipse-setup-2.png similarity index 100% rename from spring-framework-reference/images/eclipse-setup-2.png rename to src/reference/docbook/images/eclipse-setup-2.png diff --git a/spring-framework-reference/images/eclipse-setup-3.png b/src/reference/docbook/images/eclipse-setup-3.png similarity index 100% rename from spring-framework-reference/images/eclipse-setup-3.png rename to src/reference/docbook/images/eclipse-setup-3.png diff --git a/spring-framework-reference/images/ejb.gif b/src/reference/docbook/images/ejb.gif similarity index 100% rename from spring-framework-reference/images/ejb.gif rename to src/reference/docbook/images/ejb.gif diff --git a/spring-framework-reference/images/ejb.png b/src/reference/docbook/images/ejb.png similarity index 100% rename from spring-framework-reference/images/ejb.png rename to src/reference/docbook/images/ejb.png diff --git a/spring-framework-reference/images/ejb.svg b/src/reference/docbook/images/ejb.svg similarity index 100% rename from spring-framework-reference/images/ejb.svg rename to src/reference/docbook/images/ejb.svg diff --git a/spring-framework-reference/images/full.gif b/src/reference/docbook/images/full.gif similarity index 100% rename from spring-framework-reference/images/full.gif rename to src/reference/docbook/images/full.gif diff --git a/spring-framework-reference/images/full.png b/src/reference/docbook/images/full.png similarity index 100% rename from spring-framework-reference/images/full.png rename to src/reference/docbook/images/full.png diff --git a/spring-framework-reference/images/full.svg b/src/reference/docbook/images/full.svg similarity index 100% rename from spring-framework-reference/images/full.svg rename to src/reference/docbook/images/full.svg diff --git a/spring-framework-reference/images/html-logo.png b/src/reference/docbook/images/html-logo.png similarity index 100% rename from spring-framework-reference/images/html-logo.png rename to src/reference/docbook/images/html-logo.png diff --git a/spring-framework-reference/images/idea-setup-1.png b/src/reference/docbook/images/idea-setup-1.png similarity index 100% rename from spring-framework-reference/images/idea-setup-1.png rename to src/reference/docbook/images/idea-setup-1.png diff --git a/spring-framework-reference/images/idea-setup-2.png b/src/reference/docbook/images/idea-setup-2.png similarity index 100% rename from spring-framework-reference/images/idea-setup-2.png rename to src/reference/docbook/images/idea-setup-2.png diff --git a/spring-framework-reference/images/idea-setup-3.png b/src/reference/docbook/images/idea-setup-3.png similarity index 100% rename from spring-framework-reference/images/idea-setup-3.png rename to src/reference/docbook/images/idea-setup-3.png diff --git a/spring-framework-reference/images/idea-setup-4.png b/src/reference/docbook/images/idea-setup-4.png similarity index 100% rename from spring-framework-reference/images/idea-setup-4.png rename to src/reference/docbook/images/idea-setup-4.png diff --git a/spring-framework-reference/images/idea-setup-5.png b/src/reference/docbook/images/idea-setup-5.png similarity index 100% rename from spring-framework-reference/images/idea-setup-5.png rename to src/reference/docbook/images/idea-setup-5.png diff --git a/spring-framework-reference/images/idea-setup-6.png b/src/reference/docbook/images/idea-setup-6.png similarity index 100% rename from spring-framework-reference/images/idea-setup-6.png rename to src/reference/docbook/images/idea-setup-6.png diff --git a/spring-framework-reference/images/logo-pdf.png b/src/reference/docbook/images/logo-pdf.png similarity index 100% rename from spring-framework-reference/images/logo-pdf.png rename to src/reference/docbook/images/logo-pdf.png diff --git a/spring-framework-reference/images/logo.gif b/src/reference/docbook/images/logo.gif similarity index 100% rename from spring-framework-reference/images/logo.gif rename to src/reference/docbook/images/logo.gif diff --git a/spring-framework-reference/images/logo.jpg b/src/reference/docbook/images/logo.jpg similarity index 100% rename from spring-framework-reference/images/logo.jpg rename to src/reference/docbook/images/logo.jpg diff --git a/spring-framework-reference/images/logo.psd b/src/reference/docbook/images/logo.psd similarity index 100% rename from spring-framework-reference/images/logo.psd rename to src/reference/docbook/images/logo.psd diff --git a/spring-framework-reference/images/logo.xcf b/src/reference/docbook/images/logo.xcf similarity index 100% rename from spring-framework-reference/images/logo.xcf rename to src/reference/docbook/images/logo.xcf diff --git a/spring-framework-reference/images/mvc-contexts.gif b/src/reference/docbook/images/mvc-contexts.gif similarity index 100% rename from spring-framework-reference/images/mvc-contexts.gif rename to src/reference/docbook/images/mvc-contexts.gif diff --git a/spring-framework-reference/images/mvc.png b/src/reference/docbook/images/mvc.png similarity index 100% rename from spring-framework-reference/images/mvc.png rename to src/reference/docbook/images/mvc.png diff --git a/spring-framework-reference/images/note.gif b/src/reference/docbook/images/note.gif similarity index 100% rename from spring-framework-reference/images/note.gif rename to src/reference/docbook/images/note.gif diff --git a/spring-framework-reference/images/note.png b/src/reference/docbook/images/note.png similarity index 100% rename from spring-framework-reference/images/note.png rename to src/reference/docbook/images/note.png diff --git a/spring-framework-reference/images/overview-ejb.graffle b/src/reference/docbook/images/overview-ejb.graffle similarity index 100% rename from spring-framework-reference/images/overview-ejb.graffle rename to src/reference/docbook/images/overview-ejb.graffle diff --git a/spring-framework-reference/images/overview-ejb.png b/src/reference/docbook/images/overview-ejb.png similarity index 100% rename from spring-framework-reference/images/overview-ejb.png rename to src/reference/docbook/images/overview-ejb.png diff --git a/spring-framework-reference/images/overview-full.graffle b/src/reference/docbook/images/overview-full.graffle similarity index 100% rename from spring-framework-reference/images/overview-full.graffle rename to src/reference/docbook/images/overview-full.graffle diff --git a/spring-framework-reference/images/overview-full.png b/src/reference/docbook/images/overview-full.png similarity index 100% rename from spring-framework-reference/images/overview-full.png rename to src/reference/docbook/images/overview-full.png diff --git a/spring-framework-reference/images/overview-remoting.graffle b/src/reference/docbook/images/overview-remoting.graffle similarity index 100% rename from spring-framework-reference/images/overview-remoting.graffle rename to src/reference/docbook/images/overview-remoting.graffle diff --git a/spring-framework-reference/images/overview-remoting.png b/src/reference/docbook/images/overview-remoting.png similarity index 100% rename from spring-framework-reference/images/overview-remoting.png rename to src/reference/docbook/images/overview-remoting.png diff --git a/spring-framework-reference/images/overview-thirdparty-web.graffle b/src/reference/docbook/images/overview-thirdparty-web.graffle similarity index 100% rename from spring-framework-reference/images/overview-thirdparty-web.graffle rename to src/reference/docbook/images/overview-thirdparty-web.graffle diff --git a/spring-framework-reference/images/overview-thirdparty-web.png b/src/reference/docbook/images/overview-thirdparty-web.png similarity index 100% rename from spring-framework-reference/images/overview-thirdparty-web.png rename to src/reference/docbook/images/overview-thirdparty-web.png diff --git a/spring-framework-reference/images/oxm-exceptions.graffle b/src/reference/docbook/images/oxm-exceptions.graffle similarity index 100% rename from spring-framework-reference/images/oxm-exceptions.graffle rename to src/reference/docbook/images/oxm-exceptions.graffle diff --git a/spring-framework-reference/images/oxm-exceptions.png b/src/reference/docbook/images/oxm-exceptions.png similarity index 100% rename from spring-framework-reference/images/oxm-exceptions.png rename to src/reference/docbook/images/oxm-exceptions.png diff --git a/spring-framework-reference/images/pdf-logo.png b/src/reference/docbook/images/pdf-logo.png similarity index 100% rename from spring-framework-reference/images/pdf-logo.png rename to src/reference/docbook/images/pdf-logo.png diff --git a/spring-framework-reference/images/prototype.png b/src/reference/docbook/images/prototype.png similarity index 100% rename from spring-framework-reference/images/prototype.png rename to src/reference/docbook/images/prototype.png diff --git a/spring-framework-reference/images/remoting.gif b/src/reference/docbook/images/remoting.gif similarity index 100% rename from spring-framework-reference/images/remoting.gif rename to src/reference/docbook/images/remoting.gif diff --git a/spring-framework-reference/images/remoting.png b/src/reference/docbook/images/remoting.png similarity index 100% rename from spring-framework-reference/images/remoting.png rename to src/reference/docbook/images/remoting.png diff --git a/spring-framework-reference/images/remoting.svg b/src/reference/docbook/images/remoting.svg similarity index 100% rename from spring-framework-reference/images/remoting.svg rename to src/reference/docbook/images/remoting.svg diff --git a/spring-framework-reference/images/singleton.png b/src/reference/docbook/images/singleton.png similarity index 100% rename from spring-framework-reference/images/singleton.png rename to src/reference/docbook/images/singleton.png diff --git a/spring-framework-reference/images/spring-overview.gif b/src/reference/docbook/images/spring-overview.gif similarity index 100% rename from spring-framework-reference/images/spring-overview.gif rename to src/reference/docbook/images/spring-overview.gif diff --git a/spring-framework-reference/images/spring-overview.graffle b/src/reference/docbook/images/spring-overview.graffle similarity index 100% rename from spring-framework-reference/images/spring-overview.graffle rename to src/reference/docbook/images/spring-overview.graffle diff --git a/spring-framework-reference/images/spring-overview.png b/src/reference/docbook/images/spring-overview.png similarity index 100% rename from spring-framework-reference/images/spring-overview.png rename to src/reference/docbook/images/spring-overview.png diff --git a/spring-framework-reference/images/spring-overview.svg b/src/reference/docbook/images/spring-overview.svg similarity index 100% rename from spring-framework-reference/images/spring-overview.svg rename to src/reference/docbook/images/spring-overview.svg diff --git a/spring-framework-reference/images/spring-overview.vsd b/src/reference/docbook/images/spring-overview.vsd similarity index 100% rename from spring-framework-reference/images/spring-overview.vsd rename to src/reference/docbook/images/spring-overview.vsd diff --git a/spring-framework-reference/images/spring.sxd b/src/reference/docbook/images/spring.sxd similarity index 100% rename from spring-framework-reference/images/spring.sxd rename to src/reference/docbook/images/spring.sxd diff --git a/spring-framework-reference/images/springsource-banner-rhs.png b/src/reference/docbook/images/springsource-banner-rhs.png similarity index 100% rename from spring-framework-reference/images/springsource-banner-rhs.png rename to src/reference/docbook/images/springsource-banner-rhs.png diff --git a/spring-framework-reference/images/thirdparty-web.gif b/src/reference/docbook/images/thirdparty-web.gif similarity index 100% rename from spring-framework-reference/images/thirdparty-web.gif rename to src/reference/docbook/images/thirdparty-web.gif diff --git a/spring-framework-reference/images/thirdparty-web.png b/src/reference/docbook/images/thirdparty-web.png similarity index 100% rename from spring-framework-reference/images/thirdparty-web.png rename to src/reference/docbook/images/thirdparty-web.png diff --git a/spring-framework-reference/images/thirdparty-web.svg b/src/reference/docbook/images/thirdparty-web.svg similarity index 100% rename from spring-framework-reference/images/thirdparty-web.svg rename to src/reference/docbook/images/thirdparty-web.svg diff --git a/spring-framework-reference/images/tx.png b/src/reference/docbook/images/tx.png similarity index 100% rename from spring-framework-reference/images/tx.png rename to src/reference/docbook/images/tx.png diff --git a/spring-framework-reference/images/tx_prop_required.png b/src/reference/docbook/images/tx_prop_required.png similarity index 100% rename from spring-framework-reference/images/tx_prop_required.png rename to src/reference/docbook/images/tx_prop_required.png diff --git a/spring-framework-reference/images/tx_prop_requires_new.png b/src/reference/docbook/images/tx_prop_requires_new.png similarity index 100% rename from spring-framework-reference/images/tx_prop_requires_new.png rename to src/reference/docbook/images/tx_prop_requires_new.png diff --git a/spring-framework-reference/images/xdev-spring_logo.jpg b/src/reference/docbook/images/xdev-spring_logo.jpg similarity index 100% rename from spring-framework-reference/images/xdev-spring_logo.jpg rename to src/reference/docbook/images/xdev-spring_logo.jpg diff --git a/spring-framework-reference/src/spring-framework-reference.xml b/src/reference/docbook/index.xml similarity index 100% rename from spring-framework-reference/src/spring-framework-reference.xml rename to src/reference/docbook/index.xml diff --git a/spring-framework-reference/src/jdbc.xml b/src/reference/docbook/jdbc.xml similarity index 100% rename from spring-framework-reference/src/jdbc.xml rename to src/reference/docbook/jdbc.xml diff --git a/spring-framework-reference/src/jms.xml b/src/reference/docbook/jms.xml similarity index 100% rename from spring-framework-reference/src/jms.xml rename to src/reference/docbook/jms.xml diff --git a/spring-framework-reference/src/jmx.xml b/src/reference/docbook/jmx.xml similarity index 100% rename from spring-framework-reference/src/jmx.xml rename to src/reference/docbook/jmx.xml diff --git a/spring-framework-reference/src/mail.xml b/src/reference/docbook/mail.xml similarity index 100% rename from spring-framework-reference/src/mail.xml rename to src/reference/docbook/mail.xml diff --git a/spring-framework-reference/src/mvc.xml b/src/reference/docbook/mvc.xml similarity index 100% rename from spring-framework-reference/src/mvc.xml rename to src/reference/docbook/mvc.xml diff --git a/spring-framework-reference/src/new-in-3.0.xml b/src/reference/docbook/new-in-3.0.xml similarity index 100% rename from spring-framework-reference/src/new-in-3.0.xml rename to src/reference/docbook/new-in-3.0.xml diff --git a/spring-framework-reference/src/new-in-3.1.xml b/src/reference/docbook/new-in-3.1.xml similarity index 100% rename from spring-framework-reference/src/new-in-3.1.xml rename to src/reference/docbook/new-in-3.1.xml diff --git a/spring-framework-reference/src/orm.xml b/src/reference/docbook/orm.xml similarity index 100% rename from spring-framework-reference/src/orm.xml rename to src/reference/docbook/orm.xml diff --git a/spring-framework-reference/src/overview.xml b/src/reference/docbook/overview.xml similarity index 100% rename from spring-framework-reference/src/overview.xml rename to src/reference/docbook/overview.xml diff --git a/spring-framework-reference/src/oxm.xml b/src/reference/docbook/oxm.xml similarity index 100% rename from spring-framework-reference/src/oxm.xml rename to src/reference/docbook/oxm.xml diff --git a/spring-framework-reference/src/portlet.xml b/src/reference/docbook/portlet.xml similarity index 100% rename from spring-framework-reference/src/portlet.xml rename to src/reference/docbook/portlet.xml diff --git a/spring-framework-reference/src/preface.xml b/src/reference/docbook/preface.xml similarity index 100% rename from spring-framework-reference/src/preface.xml rename to src/reference/docbook/preface.xml diff --git a/spring-framework-reference/src/remoting.xml b/src/reference/docbook/remoting.xml similarity index 100% rename from spring-framework-reference/src/remoting.xml rename to src/reference/docbook/remoting.xml diff --git a/spring-framework-reference/src/resources.xml b/src/reference/docbook/resources.xml similarity index 100% rename from spring-framework-reference/src/resources.xml rename to src/reference/docbook/resources.xml diff --git a/spring-framework-reference/src/scheduling.xml b/src/reference/docbook/scheduling.xml similarity index 100% rename from spring-framework-reference/src/scheduling.xml rename to src/reference/docbook/scheduling.xml diff --git a/spring-framework-reference/src/spring-form.tld.xml b/src/reference/docbook/spring-form.tld.xml similarity index 100% rename from spring-framework-reference/src/spring-form.tld.xml rename to src/reference/docbook/spring-form.tld.xml diff --git a/spring-framework-reference/src/spring.tld.xml b/src/reference/docbook/spring.tld.xml similarity index 100% rename from spring-framework-reference/src/spring.tld.xml rename to src/reference/docbook/spring.tld.xml diff --git a/spring-framework-reference/src/swf-sidebar.xml b/src/reference/docbook/swf-sidebar.xml similarity index 100% rename from spring-framework-reference/src/swf-sidebar.xml rename to src/reference/docbook/swf-sidebar.xml diff --git a/spring-framework-reference/src/testing.xml b/src/reference/docbook/testing.xml similarity index 100% rename from spring-framework-reference/src/testing.xml rename to src/reference/docbook/testing.xml diff --git a/spring-framework-reference/src/transaction.xml b/src/reference/docbook/transaction.xml similarity index 100% rename from spring-framework-reference/src/transaction.xml rename to src/reference/docbook/transaction.xml diff --git a/spring-framework-reference/src/validation.xml b/src/reference/docbook/validation.xml similarity index 100% rename from spring-framework-reference/src/validation.xml rename to src/reference/docbook/validation.xml diff --git a/spring-framework-reference/src/view.xml b/src/reference/docbook/view.xml similarity index 100% rename from spring-framework-reference/src/view.xml rename to src/reference/docbook/view.xml diff --git a/spring-framework-reference/src/web-integration.xml b/src/reference/docbook/web-integration.xml similarity index 100% rename from spring-framework-reference/src/web-integration.xml rename to src/reference/docbook/web-integration.xml diff --git a/spring-framework-reference/src/xml-custom.xml b/src/reference/docbook/xml-custom.xml similarity index 100% rename from spring-framework-reference/src/xml-custom.xml rename to src/reference/docbook/xml-custom.xml diff --git a/spring-framework-reference/src/xsd-configuration.xml b/src/reference/docbook/xsd-configuration.xml similarity index 100% rename from spring-framework-reference/src/xsd-configuration.xml rename to src/reference/docbook/xsd-configuration.xml -- GitLab