switched to use XInclude

spring-framework-reference/src/aop-api.xml

@@ -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>
 

spring-framework-reference/src/aop.xml

@@ -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>
 

spring-framework-reference/src/beans.xml

@@ -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>
 

spring-framework-reference/src/cci.xml

@@ -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>
 

spring-framework-reference/src/dao.xml

@@ -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">

spring-framework-reference/src/dtd.xml

@@ -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>
 

spring-framework-reference/src/dynamic-languages.xml

@@ -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>
 

spring-framework-reference/src/ejb.xml

@@ -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>
 

spring-framework-reference/src/expressions.xml

@@ -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>
 

spring-framework-reference/src/getting-started.xml

@@ -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>
 

spring-framework-reference/src/jdbc.xml

@@ -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>
 

spring-framework-reference/src/jms.xml

@@ -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>
 

spring-framework-reference/src/jmx.xml

@@ -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>
 

spring-framework-reference/src/mail.xml

@@ -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>
 

spring-framework-reference/src/metadata.xml

@@ -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">

spring-framework-reference/src/mvc.xml

@@ -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>

spring-framework-reference/src/new-in-3.xml

@@ -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>
 

spring-framework-reference/src/orm.xml

@@ -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>
 

spring-framework-reference/src/overview.xml

@@ -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>
 

spring-framework-reference/src/oxm.xml

@@ -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>
 

spring-framework-reference/src/portlet.xml

@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="portlet">
+<!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

spring-framework-reference/src/preface.xml

@@ -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>
 

spring-framework-reference/src/remoting.xml

@@ -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>
 

spring-framework-reference/src/resources.xml

@@ -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>
 

spring-framework-reference/src/rest.xml

@@ -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>
 

spring-framework-reference/src/scheduling.xml

@@ -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">

spring-framework-reference/src/spring-form.tld.xml

@@ -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">

spring-framework-reference/src/spring-framework-reference.xml

@@ -1,44 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" 
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<!ENTITY preface 			SYSTEM "preface.xml">
+
-<!ENTITY overview			SYSTEM "overview.xml">
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
-<!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>
 	<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, 
+				Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis, 
-				Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma
+				Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma
 			</holder>
 		</copyright>
 		<legalnotice>
@@ -149,10 +113,10 @@
 	</bookinfo>
 	<!-- front matter -->
 	<toc/>
-	&preface;
+    <xi:include href="preface.xml"/>
-	&overview;
+    <xi:include href="overview.xml"/>
-	&whats-new-in-3;
+	<xi:include href="new-in-3.xml"/>
-	&getting-started;
+	<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;
+		<xi:include href="beans.xml"/>
-		&resources;
+		<xi:include href="resources.xml"/>
-		&validation;
+		<xi:include href="validation.xml"/>
-		&expressions;
+		<xi:include href="expressions.xml"/>
-		&aop;
+		<xi:include href="aop.xml"/>
-		&aop-api;
+		<xi:include href="aop-api.xml"/>
-		&testing;
+		<xi:include href="testing.xml"/>
 	</part>
 	<part id="spring-data-tier">
 		<title>Data Access</title>
@@ -255,11 +219,11 @@
 				</listitem>
 			</itemizedlist>
 		</partintro>
-		&transaction;
+		<xi:include href="transaction.xml"/>
-		&dao;
+		<xi:include href="dao.xml"/>
-		&jdbc;
+		<xi:include href="jdbc.xml"/>
-		&orm;
+		<xi:include href="orm.xml"/>
-		&oxm;
+		<xi:include href="oxm.xml"/>
 	</part>
 	<part id="spring-web">
 		<title>The Web</title>
@@ -300,11 +264,11 @@
 				</listitem>
 			</itemizedlist>
 		</partintro>
-		&mvc;
+		<xi:include href="mvc.xml"/>
-		&view;
+		<xi:include href="view.xml"/>
-		&rest;
+		<xi:include href="rest.xml"/>
-		&web-integration;
+		<xi:include href="web-integration.xml"/>
-		&portlet;
+		<xi:include href="portlet.xml"/>
 	</part>
 	<part id="spring-integration">
 		<title>Integration</title>
@@ -344,20 +308,20 @@
 				</listitem>
 			</itemizedlist>
 		</partintro>
-		&remoting;
+		<xi:include href="remoting.xml"/>
-		&ejb;
+		<xi:include href="ejb.xml"/>
-		&jms;
+		<xi:include href="jms.xml"/>
-		&jmx;
+		<xi:include href="jmx.xml"/>
-		&cci;
+		<xi:include href="cci.xml"/>
-		&mail;
+		<xi:include href="mail.xml"/>
-		&scheduling;
+		<xi:include href="scheduling.xml"/>
-		&dynamic-languages;
+		<xi:include href="dynamic-languages.xml"/>
-		&metadata;
+		<xi:include href="metadata.xml"/>
 	</part>
 	<!-- back matter -->
-	&xsd-configuration;
+	<xi:include href="xsd-configuration.xml"/>
-	&xml-custom;
+	<xi:include href="xml-custom.xml"/>
-	&dtd;
+	<xi:include href="dtd.xml"/>
-	&spring-tld;
+	<xi:include href="spring.tld.xml"/>
-	&spring-form-tld;
+	<xi:include href="spring-form.tld.xml"/>
 </book>

spring-framework-reference/src/spring.tld.xml

@@ -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">

spring-framework-reference/src/swf-sidebar.xml

@@ -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>
 

spring-framework-reference/src/testing.xml

@@ -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>
 

spring-framework-reference/src/transaction.xml

@@ -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>
 

spring-framework-reference/src/validation.xml

@@ -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>
 

spring-framework-reference/src/view.xml

@@ -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>
 

spring-framework-reference/src/web-integration.xml

@@ -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

spring-framework-reference/src/xml-custom.xml

@@ -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">

spring-framework-reference/src/xsd-configuration.xml

@@ -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">

spring-framework.ipr

@@ -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="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="gsp">
-          <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" />
@@ -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">
+        <ADDITIONAL_INDENT_OPTIONS fileType="sql">
-          <option name="INDENT_SIZE" value="4" />
+          <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="jsp">
-          <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" />
@@ -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" />