From 0fc5a5d912a4548f9bbf6f14024dc489d94cb2c9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 7 May 2013 16:54:14 +0200 Subject: [PATCH] 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 --- .../aop/config/spring-aop-4.0.xsd | 410 ++++++ .../beans/factory/xml/spring-beans-4.0.xsd | 1185 +++++++++++++++++ .../beans/factory/xml/spring-beans.dtd | 606 --------- .../beans/factory/xml/spring-tool-4.0.xsd | 115 ++ .../beans/factory/xml/spring-util-4.0.xsd | 212 +++ .../cache/config/spring-cache-4.0.xsd | 261 ++++ .../context/config/spring-context-4.0.xsd | 4 +- .../ejb/config/spring-jee-4.0.xsd | 267 ++++ .../scheduling/config/spring-task-4.0.xsd | 297 +++++ .../scripting/config/spring-lang-4.0.xsd | 233 ++++ .../xml/XmlBeanFactoryTests-overrides.xml | 8 +- .../XmlBeanFactoryTests-recursiveImport.xml | 2 +- .../xml/XmlBeanFactoryTests-resource.xml | 10 +- .../jms/config/spring-jms-4.0.xsd | 480 +++++++ .../oxm/config/spring-oxm-1.5.xsd | 146 -- .../oxm/config/spring-oxm-4.0.xsd | 158 +++ .../transaction/config/spring-tx-4.0.xsd | 4 +- .../web/servlet/config/spring-mvc-4.0.xsd | 435 ++++++ src/reference/docbook/aop-api.xml | 4 +- src/reference/docbook/beans-dependencies.xml | 4 +- src/reference/docbook/classic-aop-spring.xml | 6 +- 21 files changed, 4072 insertions(+), 775 deletions(-) create mode 100644 spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd create mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.0.xsd delete mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd create mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.0.xsd create mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd create mode 100644 spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.0.xsd create mode 100644 spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.0.xsd create mode 100644 spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.0.xsd create mode 100644 spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.0.xsd create mode 100644 spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.0.xsd delete mode 100644 spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd create mode 100644 spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd create mode 100644 spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd new file mode 100644 index 0000000000..d424628bbb --- /dev/null +++ b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.0.xsd new file mode 100644 index 0000000000..2a4ec169e7 --- /dev/null +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.0.xsd @@ -0,0 +1,1185 @@ + + + + + + + + + + + + + + + + + + element. + ]]> + + + + + + + + and other elements, typically the root element in the document. + Allows the definition of default values for all nested bean definitions. May itself + be nested for the purpose of defining a subset of beans with certain default values or + to be registered only when certain profile(s) are active. Any such nested element + must be declared as the last element in the document. + ]]> + + + + + + + + + + + + + + + element should be parsed. Multiple profiles + can be separated by spaces, commas, or semi-colons. + + If one or more of the specified profiles are active at time of parsing, the + element will be parsed, and all of its elements registered, <import> + elements followed, etc. If none of the specified profiles are active at time of + parsing, then the entire element and its contents will be ignored. + + If a profile is prefixed with the NOT operator '!', e.g. + + + + indicates that the element should be parsed if profile "p1" is active or + if profile "p2" is not active. + + Profiles are activated in one of two ways: + Programmatic: + ConfigurableEnvironment#setActiveProfiles(String...) + ConfigurableEnvironment#setDefaultProfiles(String...) + + Properties (typically through -D system properties, environment variables, or + servlet context init params): + spring.profiles.active=p1,p2 + spring.profiles.default=p1,p2 + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + element (or "ref" + attribute). We recommend this in most cases as it makes documentation + more explicit. + + Note that this default mode also allows for annotation-driven autowiring, + if activated. "no" refers to externally driven autowiring only, not + affecting any autowiring demands that the bean class itself expresses. + + 2. "byName" + Autowiring by property name. If a bean of class Cat exposes a "dog" + property, Spring will try to set this to the value of the bean "dog" + in the current container. If there is no matching bean by name, nothing + special happens. + + 3. "byType" + Autowiring if there is exactly one bean of the property type in the + container. If there is more than one, a fatal error is raised, and + you cannot use byType autowiring for that bean. If there is none, + nothing special happens. + + 4. "constructor" + Analogous to "byType" for constructor arguments. If there is not exactly + one bean of the constructor argument type in the bean factory, a fatal + error is raised. + + Note that explicit dependencies, i.e. "property" and "constructor-arg" + elements, always override autowiring. + + Note: This attribute will not be inherited by child bean definitions. + Hence, it needs to be specified per concrete bean definition. + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + " element. + ]]> + + + + + ..." element. + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ". + ]]> + + + + + ..." element. + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ". + ]]> + + + + + ..." + element. + ]]> + + + + + ". + ]]> + + + + + ..." element. + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd deleted file mode 100644 index fe521abffb..0000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd +++ /dev/null @@ -1,606 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.0.xsd new file mode 100644 index 0000000000..9d84906ade --- /dev/null +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.0.xsd @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd new file mode 100644 index 0000000000..40f34f9f21 --- /dev/null +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd @@ -0,0 +1,212 @@ + + + + + + + + + + + Reference a public, static field on a type and expose its value as + a bean. For example <util:constant static-field="java.lang.Integer.MAX_VALUE"/>. + + + + + + + + + + + + Reference a property on a bean (or as a nested value) and expose its values as + a bean. For example <util:property-path path="order.customer.name"/>. + + + + + + + + + + + + Builds a List instance of the specified type, populated with the specified content. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Builds a Set instance of the specified type, populated with the specified content. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Builds a Map instance of the specified type, populated with the specified content. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Loads a Properties instance from the resource location specified by the 'location' attribute. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.0.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.0.xsd new file mode 100644 index 0000000000..63b8fd53ac --- /dev/null +++ b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.0.xsd @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd index d71bf4beea..084cccf171 100644 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd +++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd @@ -6,8 +6,8 @@ targetNamespace="http://www.springframework.org/schema/context" elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.0.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.0.xsd new file mode 100644 index 0000000000..7b10973bcb --- /dev/null +++ b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.0.xsd @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.0.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.0.xsd new file mode 100644 index 0000000000..34ea3ecb50 --- /dev/null +++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.0.xsd @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml index 0a92c7426d..7b94a9504a 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml @@ -1,5 +1,5 @@ - + @@ -19,7 +19,7 @@ - @@ -35,7 +35,7 @@ - + Jenny 30 @@ -54,7 +54,7 @@ - + diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml index c4383ad945..789ecd9951 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml index 9eb0813411..5dbbd2a690 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml @@ -1,17 +1,13 @@ - + - - classpath:org/springframework/beans/factory/xml/test.properties - - - classpath:org/springframework/beans/factory/xml/test.properties - + + diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.0.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.0.xsd new file mode 100644 index 0000000000..f5006dc598 --- /dev/null +++ b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.0.xsd @@ -0,0 +1,480 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd deleted file mode 100644 index a81a43a5fd..0000000000 --- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - Defines the elements used in Spring's Object/XML Mapping integration. - - - - - - - - Defines a JAXB1 Marshaller. - - - - - - - - - - - - The JAXB Context path - - - - - Whether incoming XML should be validated. - - - - - - - - - - - - Defines a JAXB2 Marshaller. - - - - - - - - - - - - - - - - - - - The JAXB Context path - - - - - - - - - - - - Defines a JiBX Marshaller. - - - - - - - - - - - - - The binding name used by this marshaller. - - - - - - - - - - - - Defines a XMLBeans Marshaller. - - - - - - - - - - - - - The bean name of the XmlOptions that is to be used for this marshaller. Typically a - XmlOptionsFactoryBean definition. - - - - - - - - - - - - - - - - A class supported by a marshaller. - - - - - - - - - - diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd new file mode 100644 index 0000000000..35739ca48b --- /dev/null +++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd @@ -0,0 +1,158 @@ + + + + + + + + + Defines the elements used in Spring's Object/XML Mapping integration. + + + + + + + + Defines a JAXB2 Marshaller. + + + + + + + + + + + + + + + + + + + The JAXB Context path + + + + + + + + + + + + Defines a JiBX Marshaller. + + + + + + + + + + + + + The binding name used by this marshaller. + + + + + + + + + + + + Defines a XMLBeans Marshaller. + + + + + + + + + + + + + The bean name of the XmlOptions that is to be used for this marshaller. Typically a + XmlOptionsFactoryBean definition. + + + + + + + + + + + + + + + + + + Defines a Castor Marshaller. + + + + + + + + + + + + The encoding to use for stream reading. + + + + + The target class to be bound with Castor marshaller. + + + + + The target package that contains Castor descriptor classes. + + + + + The path to Castor mapping file. + + + + + + + + + + A class supported by a marshaller. + + + + + + + + + + + diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.0.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.0.xsd index 427d723249..a9807dda04 100644 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.0.xsd +++ b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.0.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/reference/docbook/aop-api.xml b/src/reference/docbook/aop-api.xml index a616d7b30d..0d5bb290bc 100644 --- a/src/reference/docbook/aop-api.xml +++ b/src/reference/docbook/aop-api.xml @@ -198,7 +198,7 @@ <bean id="settersAndAbsquatulateAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor"> <property name="advice"> - <ref local="beanNameOfAopAllianceInterceptor"/> + <ref bean="beanNameOfAopAllianceInterceptor"/> </property> <property name="patterns"> <list> @@ -1090,7 +1090,7 @@ public interface IntroductionInfo { dependency on it, as with an ordinary Java object: <bean id="personUser" class="com.mycompany.PersonUser"> - <property name="person"><ref local="person"/></property> + <property name="person"><ref bean="person"/></property> </bean> The PersonUser class in this example would diff --git a/src/reference/docbook/beans-dependencies.xml b/src/reference/docbook/beans-dependencies.xml index 7c09841290..d191686411 100644 --- a/src/reference/docbook/beans-dependencies.xml +++ b/src/reference/docbook/beans-dependencies.xml @@ -627,7 +627,7 @@ public class ExampleBean { <property name="targetName"> <!-- a bean with id 'theTargetBean' must exist; otherwise an exception will be thrown --> - <idref local="theTargetBean"/> + <idref bean="theTargetBean"/> </property> 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. - <ref local="someBean"/> + <ref bean="someBean"/> Specifying the target bean through the parent attribute creates a reference to a bean that is in a parent container of diff --git a/src/reference/docbook/classic-aop-spring.xml b/src/reference/docbook/classic-aop-spring.xml index 68cb0d62db..b21552045e 100644 --- a/src/reference/docbook/classic-aop-spring.xml +++ b/src/reference/docbook/classic-aop-spring.xml @@ -192,7 +192,7 @@ <bean id="settersAndAbsquatulateAdvisor" class="org.springframework.aop.support.RegexpMethodPointcutAdvisor"> <property name="advice"> - <ref local="beanNameOfAopAllianceInterceptor"/> + <ref bean="beanNameOfAopAllianceInterceptor"/> </property> <property name="patterns"> <list> @@ -1040,7 +1040,7 @@ public interface IntroductionInfo { class="org.springframework.aop.framework.ProxyFactoryBean"> <property name="proxyInterfaces"><value>com.mycompany.Person</value></property> - <property name="target"><ref local="personTarget"/></property> + <property name="target"><ref bean="personTarget"/></property> <property name="interceptorNames"> <list> <value>myAdvisor</value> @@ -1074,7 +1074,7 @@ public interface IntroductionInfo { dependency on it, as with an ordinary Java object: <bean id="personUser" class="com.mycompany.PersonUser"> - <property name="person"><ref local="person" /></property> + <property name="person"><ref bean="person" /></property> </bean> The PersonUser class in this example would