Introduced 4.0 versions of all XML configuration schemas

Removed spring-beans.dtd (the 1.x variant) and spring-oxm-1.5.xsd (pre-Spring-Framework variant), in order to raise the backwards compatibility limit a little bit at least. We'll keep supporting the 2.0 and 2.5 xsd versions for the time being, as well as spring-beans-2.0.dtd.

Removed the ref 'local' attribute in spring-beans-4.0.xsd since 'local' lost its differentiating role to a regular bean ref back in the 3.1 days when we started allowing for the same bean id to reappear in a different beans section of the same configuration file (with a different profile).

Issue: SPR-10437
This commit is contained in:
Juergen Hoeller
2013-05-07 16:54:14 +02:00
committed by unknown
parent e1c25ff1a3
commit 0fc5a5d912
21 changed files with 4072 additions and 775 deletions

View File

@@ -198,7 +198,7 @@
<para><programlisting language="xml">&lt;bean id="settersAndAbsquatulateAdvisor"
class="org.springframework.aop.support.RegexpMethodPointcutAdvisor"&gt;
&lt;property name="advice"&gt;
&lt;ref local="beanNameOfAopAllianceInterceptor"/&gt;
&lt;ref bean="beanNameOfAopAllianceInterceptor"/&gt;
&lt;/property&gt;
&lt;property name="patterns"&gt;
&lt;list&gt;
@@ -1090,7 +1090,7 @@ public interface IntroductionInfo {
dependency on it, as with an ordinary Java object:</para>
<para><programlisting language="xml">&lt;bean id="personUser" class="com.mycompany.PersonUser"&gt;
&lt;property name="person"&gt;&lt;ref local="person"/&gt;&lt;/property&gt;
&lt;property name="person"&gt;&lt;ref bean="person"/&gt;&lt;/property&gt;
&lt;/bean&gt;</programlisting></para>
<para>The <literal>PersonUser</literal> class in this example would

View File

@@ -627,7 +627,7 @@ public class ExampleBean {
<programlisting language="xml">&lt;property name="targetName"&gt;
<lineannotation>&lt;!-- a bean with id 'theTargetBean' must exist; otherwise an exception will be thrown --&gt;</lineannotation>
&lt;idref local="theTargetBean"/&gt;
&lt;idref bean="theTargetBean"/&gt;
&lt;/property&gt;</programlisting>
<para>A common place (at least in versions earlier than Spring 2.0)
@@ -677,7 +677,7 @@ public class ExampleBean {
errors as early as possible) if the target bean is in the same XML
file.</para>
<programlisting language="xml">&lt;ref local="someBean"/&gt;</programlisting>
<programlisting language="xml">&lt;ref bean="someBean"/&gt;</programlisting>
<para>Specifying the target bean through the <literal>parent</literal>
attribute creates a reference to a bean that is in a parent container of

View File

@@ -192,7 +192,7 @@
<para><programlisting language="xml">&lt;bean id="settersAndAbsquatulateAdvisor"
class="org.springframework.aop.support.RegexpMethodPointcutAdvisor"&gt;
&lt;property name="advice"&gt;
&lt;ref local="beanNameOfAopAllianceInterceptor"/&gt;
&lt;ref bean="beanNameOfAopAllianceInterceptor"/&gt;
&lt;/property&gt;
&lt;property name="patterns"&gt;
&lt;list&gt;
@@ -1040,7 +1040,7 @@ public interface IntroductionInfo {
class="org.springframework.aop.framework.ProxyFactoryBean"&gt;
&lt;property name="proxyInterfaces"&gt;&lt;value&gt;com.mycompany.Person&lt;/value&gt;&lt;/property&gt;
&lt;property name="target"&gt;&lt;ref local="personTarget"/&gt;&lt;/property&gt;
&lt;property name="target"&gt;&lt;ref bean="personTarget"/&gt;&lt;/property&gt;
&lt;property name="interceptorNames"&gt;
&lt;list&gt;
&lt;value&gt;myAdvisor&lt;/value&gt;
@@ -1074,7 +1074,7 @@ public interface IntroductionInfo {
dependency on it, as with an ordinary Java object:</para>
<para><programlisting language="xml">&lt;bean id="personUser" class="com.mycompany.PersonUser"&gt;
&lt;property name="person"&gt;&lt;ref local="person" /&gt;&lt;/property&gt;
&lt;property name="person"&gt;&lt;ref bean="person" /&gt;&lt;/property&gt;
&lt;/bean&gt;</programlisting></para>
<para>The <literal>PersonUser</literal> class in this example would