diff --git a/spring-aop/src/main/resources/META-INF/spring.schemas b/spring-aop/src/main/resources/META-INF/spring.schemas index fda92512c00..c380e0e178b 100644 --- a/spring-aop/src/main/resources/META-INF/spring.schemas +++ b/spring-aop/src/main/resources/META-INF/spring.schemas @@ -1,10 +1,10 @@ -http\://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-2.0.xsd -http\://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop-2.5.xsd -http\://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd -http\://www.springframework.org/schema/aop/spring-aop-3.1.xsd=org/springframework/aop/config/spring-aop-3.1.xsd -http\://www.springframework.org/schema/aop/spring-aop-3.2.xsd=org/springframework/aop/config/spring-aop-3.2.xsd -http\://www.springframework.org/schema/aop/spring-aop-4.0.xsd=org/springframework/aop/config/spring-aop-4.0.xsd -http\://www.springframework.org/schema/aop/spring-aop-4.1.xsd=org/springframework/aop/config/spring-aop-4.1.xsd -http\://www.springframework.org/schema/aop/spring-aop-4.2.xsd=org/springframework/aop/config/spring-aop-4.2.xsd -http\://www.springframework.org/schema/aop/spring-aop-4.3.xsd=org/springframework/aop/config/spring-aop-4.3.xsd -http\://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-4.3.xsd +http\://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop-3.1.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop-3.2.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop-4.0.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop-4.1.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop-4.2.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop-4.3.xsd=org/springframework/aop/config/spring-aop.xsd +http\://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop.xsd diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd deleted file mode 100644 index bc3235b9d9d..00000000000 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.0.xsd +++ /dev/null @@ -1,405 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd deleted file mode 100644 index a2e88256945..00000000000 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-2.5.xsd +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd deleted file mode 100644 index db650af2891..00000000000 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.0.xsd +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd deleted file mode 100644 index 80e3f83d364..00000000000 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.1.xsd +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.2.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.2.xsd deleted file mode 100644 index e2ab2b7e7a8..00000000000 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.2.xsd +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 816e4782cda..00000000000 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.0.xsd +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.1.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.1.xsd deleted file mode 100644 index e9f004203d6..00000000000 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.1.xsd +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.3.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.3.xsd deleted file mode 100644 index 4dd43ca61a2..00000000000 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.3.xsd +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.2.xsd b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop.xsd similarity index 99% rename from spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.2.xsd rename to spring-aop/src/main/resources/org/springframework/aop/config/spring-aop.xsd index 2fd75a8590f..49cda9de8cd 100644 --- a/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-4.2.xsd +++ b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop.xsd @@ -7,8 +7,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + - + .*set.* @@ -22,7 +22,7 @@ org.springframework.tests.sample.beans.ITestBean - + settersAdvisor @@ -38,7 +38,7 @@ - + .*get.* @@ -51,7 +51,7 @@ org.springframework.tests.sample.beans.ITestBean true - + settersAndAbsquatulateAdvisor diff --git a/spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml index 33f30be78c1..c8d4a287f55 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml @@ -16,11 +16,11 @@ Hot swappable target source. Note the use of Type 3 IoC. --> - + - + diff --git a/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml b/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml index f633c66d5b2..57c3fb182a2 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml @@ -13,7 +13,7 @@ - + diff --git a/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml b/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml index 10ef6a35aef..2abdc9f260a 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml @@ -13,7 +13,7 @@ - + diff --git a/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml index 961269efde2..6f45a79a72e 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml @@ -26,7 +26,7 @@ This will create a bean that creates a new target on each invocation. --> - + debugInterceptor diff --git a/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml index 992f2675d9a..57e3ce659b0 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/target/ThreadLocalTargetSourceTests-context.xml @@ -17,7 +17,7 @@ We want to invoke the getStatsMixin method on our ThreadLocal invoker --> - + getStatsMixin @@ -26,7 +26,7 @@ --> debugInterceptor,statsAdvisor - + true @@ -36,7 +36,7 @@ Rod - + @@ -48,7 +48,7 @@ - + diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java index 14220eb3c57..e1582ce3ad6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java @@ -125,7 +125,7 @@ public class RootBeanDefinition extends AbstractBeanDefinition { setBeanClass(beanClass); setAutowireMode(autowireMode); if (dependencyCheck && getResolvedAutowireMode() != AUTOWIRE_CONSTRUCTOR) { - setDependencyCheck(RootBeanDefinition.DEPENDENCY_CHECK_OBJECTS); + setDependencyCheck(DEPENDENCY_CHECK_OBJECTS); } } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java index e3b3e083915..bfc3f36ff65 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java @@ -58,7 +58,6 @@ import org.springframework.beans.factory.support.ManagedProperties; import org.springframework.beans.factory.support.ManagedSet; import org.springframework.beans.factory.support.MethodOverrides; import org.springframework.beans.factory.support.ReplaceOverride; -import org.springframework.core.env.Environment; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.CollectionUtils; @@ -142,8 +141,6 @@ public class BeanDefinitionParserDelegate { public static final String PRIMARY_ATTRIBUTE = "primary"; - public static final String DEPENDENCY_CHECK_ATTRIBUTE = "dependency-check"; - public static final String DEPENDS_ON_ATTRIBUTE = "depends-on"; public static final String INIT_METHOD_ATTRIBUTE = "init-method"; @@ -186,8 +183,6 @@ public class BeanDefinitionParserDelegate { public static final String BEAN_REF_ATTRIBUTE = "bean"; - public static final String LOCAL_REF_ATTRIBUTE = "local"; - public static final String PARENT_REF_ATTRIBUTE = "parent"; public static final String VALUE_ELEMENT = "value"; @@ -351,10 +346,6 @@ public class BeanDefinitionParserDelegate { } defaults.setAutowire(autowire); - // Don't fall back to parentDefaults for dependency-check as it's no longer supported in - // as of 3.0. Therefore, no nested would ever need to fall back to it. - defaults.setDependencyCheck(root.getAttribute(DEFAULT_DEPENDENCY_CHECK_ATTRIBUTE)); - if (root.hasAttribute(DEFAULT_AUTOWIRE_CANDIDATES_ATTRIBUTE)) { defaults.setAutowireCandidates(root.getAttribute(DEFAULT_AUTOWIRE_CANDIDATES_ATTRIBUTE)); } @@ -394,7 +385,6 @@ public class BeanDefinitionParserDelegate { public BeanDefinitionDefaults getBeanDefinitionDefaults() { BeanDefinitionDefaults bdd = new BeanDefinitionDefaults(); bdd.setLazyInit("TRUE".equalsIgnoreCase(this.defaults.getLazyInit())); - bdd.setDependencyCheck(this.getDependencyCheck(DEFAULT_VALUE)); bdd.setAutowireMode(this.getAutowireMode(DEFAULT_VALUE)); bdd.setInitMethodName(this.defaults.getInitMethod()); bdd.setDestroyMethodName(this.defaults.getDestroyMethod()); @@ -593,9 +583,6 @@ public class BeanDefinitionParserDelegate { String autowire = ele.getAttribute(AUTOWIRE_ATTRIBUTE); bd.setAutowireMode(getAutowireMode(autowire)); - String dependencyCheck = ele.getAttribute(DEPENDENCY_CHECK_ATTRIBUTE); - bd.setDependencyCheck(getDependencyCheck(dependencyCheck)); - if (ele.hasAttribute(DEPENDS_ON_ATTRIBUTE)) { String dependsOn = ele.getAttribute(DEPENDS_ON_ATTRIBUTE); bd.setDependsOn(StringUtils.tokenizeToStringArray(dependsOn, MULTI_VALUE_ATTRIBUTE_DELIMITERS)); @@ -703,25 +690,6 @@ public class BeanDefinitionParserDelegate { return autowire; } - public int getDependencyCheck(String attValue) { - String att = attValue; - if (DEFAULT_VALUE.equals(att)) { - att = this.defaults.getDependencyCheck(); - } - if (DEPENDENCY_CHECK_ALL_ATTRIBUTE_VALUE.equals(att)) { - return AbstractBeanDefinition.DEPENDENCY_CHECK_ALL; - } - else if (DEPENDENCY_CHECK_OBJECTS_ATTRIBUTE_VALUE.equals(att)) { - return AbstractBeanDefinition.DEPENDENCY_CHECK_OBJECTS; - } - else if (DEPENDENCY_CHECK_SIMPLE_ATTRIBUTE_VALUE.equals(att)) { - return AbstractBeanDefinition.DEPENDENCY_CHECK_SIMPLE; - } - else { - return AbstractBeanDefinition.DEPENDENCY_CHECK_NONE; - } - } - /** * Parse constructor-arg sub-elements of the given bean element. */ @@ -1020,16 +988,12 @@ public class BeanDefinitionParserDelegate { String refName = ele.getAttribute(BEAN_REF_ATTRIBUTE); boolean toParent = false; if (!StringUtils.hasLength(refName)) { - // A reference to the id of another bean in the same XML file. - refName = ele.getAttribute(LOCAL_REF_ATTRIBUTE); + // A reference to the id of another bean in a parent context. + refName = ele.getAttribute(PARENT_REF_ATTRIBUTE); + toParent = true; if (!StringUtils.hasLength(refName)) { - // A reference to the id of another bean in a parent context. - refName = ele.getAttribute(PARENT_REF_ATTRIBUTE); - toParent = true; - if (!StringUtils.hasLength(refName)) { - error("'bean', 'local' or 'parent' is required for element", ele); - return null; - } + error("'bean' or 'parent' is required for element", ele); + return null; } } if (!StringUtils.hasText(refName)) { @@ -1081,12 +1045,8 @@ public class BeanDefinitionParserDelegate { // A generic reference to any name of any bean. String refName = ele.getAttribute(BEAN_REF_ATTRIBUTE); if (!StringUtils.hasLength(refName)) { - // A reference to the id of another bean in the same XML file. - refName = ele.getAttribute(LOCAL_REF_ATTRIBUTE); - if (!StringUtils.hasLength(refName)) { - error("Either 'bean' or 'local' is required for element", ele); - return null; - } + error("'bean' is required for element", ele); + return null; } if (!StringUtils.hasText(refName)) { error(" element contains empty target attribute", ele); @@ -1469,8 +1429,10 @@ public class BeanDefinitionParserDelegate { /** - * Get the namespace URI for the supplied node. The default implementation uses {@link Node#getNamespaceURI}. - * Subclasses may override the default implementation to provide a different namespace identification mechanism. + * Get the namespace URI for the supplied node. + *

The default implementation uses {@link Node#getNamespaceURI}. + * Subclasses may override the default implementation to provide a + * different namespace identification mechanism. * @param node the node */ public String getNamespaceURI(Node node) { @@ -1478,8 +1440,10 @@ public class BeanDefinitionParserDelegate { } /** - * Ges the local name for the supplied {@link Node}. The default implementation calls {@link Node#getLocalName}. - * Subclasses may override the default implementation to provide a different mechanism for getting the local name. + * Ges the local name for the supplied {@link Node}. + *

The default implementation calls {@link Node#getLocalName}. + * Subclasses may override the default implementation to provide a + * different mechanism for getting the local name. * @param node the {@code Node} */ public String getLocalName(Node node) { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java index ebf513663a6..930be051211 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java @@ -34,8 +34,6 @@ public class DocumentDefaultsDefinition implements DefaultsDefinition { private String autowire; - private String dependencyCheck; - private String autowireCandidates; private String initMethod; @@ -87,20 +85,6 @@ public class DocumentDefaultsDefinition implements DefaultsDefinition { return this.autowire; } - /** - * Set the default dependency-check setting for the document that's currently parsed. - */ - public void setDependencyCheck(String dependencyCheck) { - this.dependencyCheck = dependencyCheck; - } - - /** - * Return the default dependency-check setting for the document that's currently parsed. - */ - public String getDependencyCheck() { - return this.dependencyCheck; - } - /** * Set the default autowire-candidate pattern for the document that's currently parsed. * Also accepts a comma-separated list of patterns. diff --git a/spring-beans/src/main/resources/META-INF/spring.schemas b/spring-beans/src/main/resources/META-INF/spring.schemas index ffd70f14249..b2fe79ddf86 100644 --- a/spring-beans/src/main/resources/META-INF/spring.schemas +++ b/spring-beans/src/main/resources/META-INF/spring.schemas @@ -1,30 +1,30 @@ -http\://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd -http\://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd -http\://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd -http\://www.springframework.org/schema/beans/spring-beans-3.1.xsd=org/springframework/beans/factory/xml/spring-beans-3.1.xsd -http\://www.springframework.org/schema/beans/spring-beans-3.2.xsd=org/springframework/beans/factory/xml/spring-beans-3.2.xsd -http\://www.springframework.org/schema/beans/spring-beans-4.0.xsd=org/springframework/beans/factory/xml/spring-beans-4.0.xsd -http\://www.springframework.org/schema/beans/spring-beans-4.1.xsd=org/springframework/beans/factory/xml/spring-beans-4.1.xsd -http\://www.springframework.org/schema/beans/spring-beans-4.2.xsd=org/springframework/beans/factory/xml/spring-beans-4.2.xsd -http\://www.springframework.org/schema/beans/spring-beans-4.3.xsd=org/springframework/beans/factory/xml/spring-beans-4.3.xsd -http\://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans-4.3.xsd -http\://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool-2.0.xsd -http\://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd -http\://www.springframework.org/schema/tool/spring-tool-3.0.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd -http\://www.springframework.org/schema/tool/spring-tool-3.1.xsd=org/springframework/beans/factory/xml/spring-tool-3.1.xsd -http\://www.springframework.org/schema/tool/spring-tool-3.2.xsd=org/springframework/beans/factory/xml/spring-tool-3.2.xsd -http\://www.springframework.org/schema/tool/spring-tool-4.0.xsd=org/springframework/beans/factory/xml/spring-tool-4.0.xsd -http\://www.springframework.org/schema/tool/spring-tool-4.1.xsd=org/springframework/beans/factory/xml/spring-tool-4.1.xsd -http\://www.springframework.org/schema/tool/spring-tool-4.2.xsd=org/springframework/beans/factory/xml/spring-tool-4.2.xsd -http\://www.springframework.org/schema/tool/spring-tool-4.3.xsd=org/springframework/beans/factory/xml/spring-tool-4.3.xsd -http\://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool-4.3.xsd -http\://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util-2.0.xsd -http\://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd -http\://www.springframework.org/schema/util/spring-util-3.0.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd -http\://www.springframework.org/schema/util/spring-util-3.1.xsd=org/springframework/beans/factory/xml/spring-util-3.1.xsd -http\://www.springframework.org/schema/util/spring-util-3.2.xsd=org/springframework/beans/factory/xml/spring-util-3.2.xsd -http\://www.springframework.org/schema/util/spring-util-4.0.xsd=org/springframework/beans/factory/xml/spring-util-4.0.xsd -http\://www.springframework.org/schema/util/spring-util-4.1.xsd=org/springframework/beans/factory/xml/spring-util-4.1.xsd -http\://www.springframework.org/schema/util/spring-util-4.2.xsd=org/springframework/beans/factory/xml/spring-util-4.2.xsd -http\://www.springframework.org/schema/util/spring-util-4.3.xsd=org/springframework/beans/factory/xml/spring-util-4.3.xsd -http\://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util-4.3.xsd +http\://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans-3.1.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans-3.2.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans-4.0.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans-4.1.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans-4.2.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans-4.3.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans.xsd +http\://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool-3.0.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool-3.1.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool-3.2.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool-4.0.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool-4.1.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool-4.2.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool-4.3.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool.xsd +http\://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util-3.0.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util-3.1.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util-3.2.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util-4.0.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util-4.1.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util-4.2.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util-4.3.xsd=org/springframework/beans/factory/xml/spring-util.xsd +http\://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util.xsd diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd deleted file mode 100644 index edb9aca7b3c..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.dtd +++ /dev/null @@ -1,679 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd deleted file mode 100644 index 3bceb75aac2..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.0.xsd +++ /dev/null @@ -1,1077 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ' element. - ]]> - - - - - - - - - - ' element. - ]]> - - - - - - - - - - - - - - ' element. - ]]> - - - - - - - - - - - - - ' element. - ]]> - - - - - ' element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element (or "ref" - attribute). We recommend this in most cases as it makes documentation - more explicit. - - 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; use dependency-check="objects" to raise an error in - that case. - - 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; use dependency-check="objects" to raise an - error in that case. - - 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. - - 5. "autodetect" - Chooses "constructor" or "byType" through introspection of the bean - class. If a default constructor is found, "byType" gets applied. - - Note that explicit dependencies, i.e. "property" and "constructor-arg" - elements, always override autowiring. Autowire behavior can be combined - with dependency checking, which will be performed after all autowiring - has been completed. - - 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. - ]]> - - - - - ". - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd deleted file mode 100644 index eb01556e2ed..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-2.5.xsd +++ /dev/null @@ -1,1164 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ' element. - ]]> - - - - - - - - - - ' element. - ]]> - - - - - - - - - - - - - - ' element. - ]]> - - - - - - - - - - - - - ' element for the semantic details of autowire candidate beans. - ]]> - - - - - ' element. - ]]> - - - - - ' element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element (or "ref" - attribute). We recommend this in most cases as it makes documentation - more explicit. - - 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; use dependency-check="objects" to raise an error in - that case. - - 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; use dependency-check="objects" to raise an - error in that case. - - 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. - - 5. "autodetect" - Chooses "constructor" or "byType" through introspection of the bean - class. If a default constructor is found, "byType" gets applied. - - Note that explicit dependencies, i.e. "property" and "constructor-arg" - elements, always override autowiring. Autowire behavior can be combined - with dependency checking, which will be performed after all autowiring - has been completed. - - 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. - ]]> - - - - - ". - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd deleted file mode 100644 index dce67a3b755..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.0.xsd +++ /dev/null @@ -1,1152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ' element. - ]]> - - - - - - - - - - ' element. - ]]> - - - - - - - - - - - - - ' element for the semantic details of autowire candidate beans. - ]]> - - - - - ' element. - ]]> - - - - - ' element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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. - ]]> - - - - - ". - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd deleted file mode 100644 index d26bebf5323..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.1.xsd +++ /dev/null @@ -1,1189 +0,0 @@ - - - - - - - - - - - - - - - - - - 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. - ]]> - - - - - ". - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.2.xsd deleted file mode 100644 index fe427c2f556..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.2.xsd +++ /dev/null @@ -1,1203 +0,0 @@ - - - - - - - - - - - - - - - - - - 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-4.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.0.xsd deleted file mode 100644 index 8226d49b551..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.0.xsd +++ /dev/null @@ -1,1185 +0,0 @@ - - - - - - - - - - - - - - - - - - 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-4.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.1.xsd deleted file mode 100644 index 8dfe6d25f2e..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.1.xsd +++ /dev/null @@ -1,1201 +0,0 @@ - - - - - - - - - - - - - - - - - - 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. It can be - shared through the 'default-autowire' attribute at the 'beans' level - and potentially inherited from outer 'beans' defaults in case of nested - 'beans' sections (e.g. with different profiles). - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " element. - ]]> - - - - - ..." element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ". - ]]> - - - - - ..." element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ". - ]]> - - - - - ..." - element. - ]]> - - - - - ". - ]]> - - - - - ..." element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.2.xsd deleted file mode 100644 index 4064c7bc0d5..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.2.xsd +++ /dev/null @@ -1,1201 +0,0 @@ - - - - - - - - - - - - - - - - - - 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. It can be - shared through the 'default-autowire' attribute at the 'beans' level - and potentially inherited from outer 'beans' defaults in case of nested - 'beans' sections (e.g. with different profiles). - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " element. - ]]> - - - - - ..." element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ". - ]]> - - - - - ..." element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ". - ]]> - - - - - ..." - element. - ]]> - - - - - ". - ]]> - - - - - ..." element. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.3.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd similarity index 100% rename from spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.3.xsd rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd deleted file mode 100644 index 94f40e8ecb7..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.0.xsd +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd deleted file mode 100644 index 17bec6dbecc..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-2.5.xsd +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.0.xsd deleted file mode 100644 index 62af97012f7..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.0.xsd +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.2.xsd deleted file mode 100644 index 9d84906adea..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.2.xsd +++ /dev/null @@ -1,115 +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 deleted file mode 100644 index 9d84906adea..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.0.xsd +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.1.xsd deleted file mode 100644 index 9d84906adea..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.1.xsd +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.2.xsd deleted file mode 100644 index 9d84906adea..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.2.xsd +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.3.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.3.xsd deleted file mode 100644 index 9d84906adea..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.3.xsd +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool.xsd similarity index 100% rename from spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.1.xsd rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool.xsd diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd deleted file mode 100644 index 509c0eeaeee..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.0.xsd +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - 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-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd deleted file mode 100644 index eb04ecff4a5..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-2.5.xsd +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - 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-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd deleted file mode 100644 index 287e31ba81c..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.0.xsd +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - 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-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd deleted file mode 100644 index 9b5774a46c4..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.1.xsd +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - 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-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd deleted file mode 100644 index f7a754aa6c2..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - 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-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 deleted file mode 100644 index 40f34f9f216..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.0.xsd +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - 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-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.1.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.1.xsd deleted file mode 100644 index 836c4a95b0c..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.1.xsd +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - 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-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.3.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.3.xsd deleted file mode 100644 index a14a2c51c58..00000000000 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.3.xsd +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - 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-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.xsd similarity index 99% rename from spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.2.xsd rename to spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.xsd index 67651bcee17..ec64e9e4c96 100644 --- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-4.2.xsd +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java index d571112c42a..fa9cec9db1e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; +import org.w3c.dom.Element; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.TypedStringValue; @@ -32,8 +33,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.tests.beans.CollectingReaderEventListener; -import org.w3c.dom.Element; - import static org.junit.Assert.*; /** @@ -65,7 +64,6 @@ public class EventPublicationTests { DocumentDefaultsDefinition defaults = (DocumentDefaultsDefinition) defaultsList.get(0); assertEquals("true", defaults.getLazyInit()); assertEquals("constructor", defaults.getAutowire()); - assertEquals("objects", defaults.getDependencyCheck()); assertEquals("myInit", defaults.getInitMethod()); assertEquals("myDestroy", defaults.getDestroyMethod()); assertEquals("true", defaults.getMerge()); diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml index 7e262a0a0d4..0b9a97de5b8 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml @@ -1,8 +1,8 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml index 9047d26b097..de31737e4fc 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml @@ -8,7 +8,7 @@ 30 - + @@ -29,8 +29,8 @@ List of Rod's friends - - + + @@ -39,7 +39,7 @@ Jenny 30 - + @@ -54,8 +54,8 @@ 32 - - + + @@ -69,7 +69,7 @@ My List - + @@ -77,12 +77,12 @@ - + literal - - + + - + literal2 @@ -92,9 +92,9 @@ - + literal - + @@ -106,7 +106,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -192,16 +192,16 @@ bar - + zero bar - + - + ba @@ -210,7 +210,7 @@ bar - + @@ -228,7 +228,7 @@ bar - + @@ -238,7 +238,7 @@ bar - + @@ -283,7 +283,7 @@ one - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml index 9a39ab975b8..7441d960479 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml @@ -23,7 +23,7 @@ - + - + 27 gotcha @@ -44,21 +44,21 @@ - + 27 - + 27 - + 27 @@ -80,25 +80,25 @@ - + testBeanOnlyPrototypeDISetterString - + 27 gotcha - + - + 27 gotcha bogus diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml index 933e66b7d00..71faa7e27e5 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml @@ -55,7 +55,7 @@ Kerry 34 - + @@ -68,7 +68,7 @@ typeMismatch 34x - + @@ -96,20 +96,20 @@ repeated references to the same FactoryBean --> - + - + - + diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml index ae2ec8bd34d..bbe23b83ddd 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml @@ -6,8 +6,8 @@ - - + + diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml index 3f85a53524b..17f789e2e3c 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml @@ -8,8 +8,8 @@ - - + + diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml index 3305cc660be..b805ac5f0ec 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml @@ -16,8 +16,8 @@ - - + + diff --git a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java index 83d72a9d224..808df1adea8 100644 --- a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -65,8 +65,6 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser { private static final String AUTOWIRE_ATTRIBUTE = "autowire"; - private static final String DEPENDENCY_CHECK_ATTRIBUTE = "dependency-check"; - private static final String DEPENDS_ON_ATTRIBUTE = "depends-on"; private static final String INIT_METHOD_ATTRIBUTE = "init-method"; @@ -142,10 +140,6 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser { } bd.setAutowireMode(autowireMode); - // Determine dependency check setting. - String dependencyCheck = element.getAttribute(DEPENDENCY_CHECK_ATTRIBUTE); - bd.setDependencyCheck(parserContext.getDelegate().getDependencyCheck(dependencyCheck)); - // Parse depends-on list of bean names. String dependsOn = element.getAttribute(DEPENDS_ON_ATTRIBUTE); if (StringUtils.hasLength(dependsOn)) { diff --git a/spring-context/src/main/resources/META-INF/spring.schemas b/spring-context/src/main/resources/META-INF/spring.schemas index e971bae9c21..dc9be69d769 100644 --- a/spring-context/src/main/resources/META-INF/spring.schemas +++ b/spring-context/src/main/resources/META-INF/spring.schemas @@ -1,44 +1,44 @@ -http\://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context-2.5.xsd -http\://www.springframework.org/schema/context/spring-context-3.0.xsd=org/springframework/context/config/spring-context-3.0.xsd -http\://www.springframework.org/schema/context/spring-context-3.1.xsd=org/springframework/context/config/spring-context-3.1.xsd -http\://www.springframework.org/schema/context/spring-context-3.2.xsd=org/springframework/context/config/spring-context-3.2.xsd -http\://www.springframework.org/schema/context/spring-context-4.0.xsd=org/springframework/context/config/spring-context-4.0.xsd -http\://www.springframework.org/schema/context/spring-context-4.1.xsd=org/springframework/context/config/spring-context-4.1.xsd -http\://www.springframework.org/schema/context/spring-context-4.2.xsd=org/springframework/context/config/spring-context-4.2.xsd -http\://www.springframework.org/schema/context/spring-context-4.3.xsd=org/springframework/context/config/spring-context-4.3.xsd -http\://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context-4.3.xsd -http\://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee-2.0.xsd -http\://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd -http\://www.springframework.org/schema/jee/spring-jee-3.0.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd -http\://www.springframework.org/schema/jee/spring-jee-3.1.xsd=org/springframework/ejb/config/spring-jee-3.1.xsd -http\://www.springframework.org/schema/jee/spring-jee-3.2.xsd=org/springframework/ejb/config/spring-jee-3.2.xsd -http\://www.springframework.org/schema/jee/spring-jee-4.0.xsd=org/springframework/ejb/config/spring-jee-4.0.xsd -http\://www.springframework.org/schema/jee/spring-jee-4.1.xsd=org/springframework/ejb/config/spring-jee-4.1.xsd -http\://www.springframework.org/schema/jee/spring-jee-4.2.xsd=org/springframework/ejb/config/spring-jee-4.2.xsd -http\://www.springframework.org/schema/jee/spring-jee-4.3.xsd=org/springframework/ejb/config/spring-jee-4.3.xsd -http\://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee-4.3.xsd -http\://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd -http\://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd -http\://www.springframework.org/schema/lang/spring-lang-3.0.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd -http\://www.springframework.org/schema/lang/spring-lang-3.1.xsd=org/springframework/scripting/config/spring-lang-3.1.xsd -http\://www.springframework.org/schema/lang/spring-lang-3.2.xsd=org/springframework/scripting/config/spring-lang-3.2.xsd -http\://www.springframework.org/schema/lang/spring-lang-4.0.xsd=org/springframework/scripting/config/spring-lang-4.0.xsd -http\://www.springframework.org/schema/lang/spring-lang-4.1.xsd=org/springframework/scripting/config/spring-lang-4.1.xsd -http\://www.springframework.org/schema/lang/spring-lang-4.2.xsd=org/springframework/scripting/config/spring-lang-4.2.xsd -http\://www.springframework.org/schema/lang/spring-lang-4.3.xsd=org/springframework/scripting/config/spring-lang-4.3.xsd -http\://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-4.3.xsd -http\://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd -http\://www.springframework.org/schema/task/spring-task-3.1.xsd=org/springframework/scheduling/config/spring-task-3.1.xsd -http\://www.springframework.org/schema/task/spring-task-3.2.xsd=org/springframework/scheduling/config/spring-task-3.2.xsd -http\://www.springframework.org/schema/task/spring-task-4.0.xsd=org/springframework/scheduling/config/spring-task-4.0.xsd -http\://www.springframework.org/schema/task/spring-task-4.1.xsd=org/springframework/scheduling/config/spring-task-4.1.xsd -http\://www.springframework.org/schema/task/spring-task-4.2.xsd=org/springframework/scheduling/config/spring-task-4.2.xsd -http\://www.springframework.org/schema/task/spring-task-4.3.xsd=org/springframework/scheduling/config/spring-task-4.3.xsd -http\://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-4.3.xsd -http\://www.springframework.org/schema/cache/spring-cache-3.1.xsd=org/springframework/cache/config/spring-cache-3.1.xsd -http\://www.springframework.org/schema/cache/spring-cache-3.2.xsd=org/springframework/cache/config/spring-cache-3.2.xsd -http\://www.springframework.org/schema/cache/spring-cache-4.0.xsd=org/springframework/cache/config/spring-cache-4.0.xsd -http\://www.springframework.org/schema/cache/spring-cache-4.1.xsd=org/springframework/cache/config/spring-cache-4.1.xsd -http\://www.springframework.org/schema/cache/spring-cache-4.2.xsd=org/springframework/cache/config/spring-cache-4.2.xsd -http\://www.springframework.org/schema/cache/spring-cache-4.3.xsd=org/springframework/cache/config/spring-cache-4.3.xsd -http\://www.springframework.org/schema/cache/spring-cache.xsd=org/springframework/cache/config/spring-cache-4.3.xsd +http\://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/context/spring-context-3.0.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/context/spring-context-3.1.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/context/spring-context-3.2.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/context/spring-context-4.0.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/context/spring-context-4.1.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/context/spring-context-4.2.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/context/spring-context-4.3.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context.xsd +http\://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee-3.0.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee-3.1.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee-3.2.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee-4.0.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee-4.1.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee-4.2.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee-4.3.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee.xsd +http\://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang-3.0.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang-3.1.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang-3.2.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang-4.0.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang-4.1.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang-4.2.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang-4.3.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang.xsd +http\://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task.xsd +http\://www.springframework.org/schema/task/spring-task-3.1.xsd=org/springframework/scheduling/config/spring-task.xsd +http\://www.springframework.org/schema/task/spring-task-3.2.xsd=org/springframework/scheduling/config/spring-task.xsd +http\://www.springframework.org/schema/task/spring-task-4.0.xsd=org/springframework/scheduling/config/spring-task.xsd +http\://www.springframework.org/schema/task/spring-task-4.1.xsd=org/springframework/scheduling/config/spring-task.xsd +http\://www.springframework.org/schema/task/spring-task-4.2.xsd=org/springframework/scheduling/config/spring-task.xsd +http\://www.springframework.org/schema/task/spring-task-4.3.xsd=org/springframework/scheduling/config/spring-task.xsd +http\://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task.xsd +http\://www.springframework.org/schema/cache/spring-cache-3.1.xsd=org/springframework/cache/config/spring-cache.xsd +http\://www.springframework.org/schema/cache/spring-cache-3.2.xsd=org/springframework/cache/config/spring-cache.xsd +http\://www.springframework.org/schema/cache/spring-cache-4.0.xsd=org/springframework/cache/config/spring-cache.xsd +http\://www.springframework.org/schema/cache/spring-cache-4.1.xsd=org/springframework/cache/config/spring-cache.xsd +http\://www.springframework.org/schema/cache/spring-cache-4.2.xsd=org/springframework/cache/config/spring-cache.xsd +http\://www.springframework.org/schema/cache/spring-cache-4.3.xsd=org/springframework/cache/config/spring-cache.xsd +http\://www.springframework.org/schema/cache/spring-cache.xsd=org/springframework/cache/config/spring-cache.xsd diff --git a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd deleted file mode 100644 index eab936d9ab9..00000000000 --- a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.1.xsd +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.2.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.2.xsd deleted file mode 100644 index baf1f802c0a..00000000000 --- a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.2.xsd +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 553e1f1920d..00000000000 --- a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.0.xsd +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.1.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.1.xsd deleted file mode 100644 index 66104b98dbe..00000000000 --- a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.1.xsd +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.2.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.2.xsd deleted file mode 100644 index b549fecbc1d..00000000000 --- a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.2.xsd +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.3.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache.xsd similarity index 99% rename from spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.3.xsd rename to spring-context/src/main/resources/org/springframework/cache/config/spring-cache.xsd index 6b1103acb25..eebf6677b99 100644 --- a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.3.xsd +++ b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag for that purpose. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd deleted file mode 100644 index 4234603664b..00000000000 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.0.xsd +++ /dev/null @@ -1,491 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag for that purpose. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd deleted file mode 100644 index 34dca16031a..00000000000 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.1.xsd +++ /dev/null @@ -1,525 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag for that purpose. - - See Javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext - for information on code-based alternatives to bootstrapping annotation-driven support. - from XML. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd deleted file mode 100644 index 6ad52984170..00000000000 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd +++ /dev/null @@ -1,522 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag for that purpose. - - See javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext - for information on code-based alternatives to bootstrapping annotation-driven support. - from XML. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 4986e6c02d5..00000000000 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.0.xsd +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag for that purpose. - - See javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext - for information on code-based alternatives to bootstrapping annotation-driven support. - from XML. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.1.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.1.xsd deleted file mode 100644 index d9aeea34c1a..00000000000 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.1.xsd +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag for that purpose. - - See javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext - for information on code-based alternatives to bootstrapping annotation-driven support. - from XML. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd deleted file mode 100644 index ad9700246ef..00000000000 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd +++ /dev/null @@ -1,539 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tag for that purpose. - - See javadoc for org.springframework.context.annotation.AnnotationConfigApplicationContext - for information on code-based alternatives to bootstrapping annotation-driven support. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context.xsd similarity index 99% rename from spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd rename to spring-context/src/main/resources/org/springframework/context/config/spring-context.xsd index c7439e98455..db365189062 100644 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd +++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd deleted file mode 100644 index f7bbed10757..00000000000 --- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-2.5.xsd +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd deleted file mode 100644 index 12679174f45..00000000000 --- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.0.xsd +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.1.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.1.xsd deleted file mode 100644 index 014077d96b1..00000000000 --- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.1.xsd +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.2.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.2.xsd deleted file mode 100644 index 8dcead927fe..00000000000 --- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.2.xsd +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.1.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.1.xsd deleted file mode 100644 index 3ad80562fbe..00000000000 --- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.1.xsd +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.2.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.2.xsd deleted file mode 100644 index c933109026e..00000000000 --- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.2.xsd +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.3.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.3.xsd deleted file mode 100644 index 5714ca953d4..00000000000 --- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.3.xsd +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.0.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.xsd similarity index 99% rename from spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.0.xsd rename to spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.xsd index 5fbbb4c2ac7..a989c7c474e 100644 --- a/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-4.0.xsd +++ b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd deleted file mode 100644 index 55a20bb00e8..00000000000 --- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.1.xsd +++ /dev/null @@ -1,288 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd deleted file mode 100644 index d76fab78968..00000000000 --- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index aaebc72957c..00000000000 --- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.0.xsd +++ /dev/null @@ -1,296 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.1.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.1.xsd deleted file mode 100644 index c4304fa185e..00000000000 --- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.1.xsd +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.2.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.2.xsd deleted file mode 100644 index 624d848ca4c..00000000000 --- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.2.xsd +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.3.xsd b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.xsd similarity index 99% rename from spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.3.xsd rename to spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.xsd index 08358de9add..4194483994b 100644 --- a/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.3.xsd +++ b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task.xsd @@ -13,8 +13,8 @@ ]]> - - + + diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd deleted file mode 100644 index 7df96963bea..00000000000 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.0.xsd +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd deleted file mode 100644 index ef231e18681..00000000000 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-2.5.xsd +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd deleted file mode 100644 index b1094e4e6da..00000000000 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.0.xsd +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd deleted file mode 100644 index fb785a1b3a4..00000000000 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.1.xsd +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd deleted file mode 100644 index 719b875a918..00000000000 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index 6b45d5e710e..00000000000 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.0.xsd +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.1.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.1.xsd deleted file mode 100644 index 5d6e222523e..00000000000 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.1.xsd +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.3.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.3.xsd deleted file mode 100644 index c2f090ba93e..00000000000 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.3.xsd +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.2.xsd b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang.xsd similarity index 99% rename from spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.2.xsd rename to spring-context/src/main/resources/org/springframework/scripting/config/spring-lang.xsd index 60c219019e7..bbbf6598e2c 100644 --- a/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-4.2.xsd +++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang.xsd @@ -15,8 +15,8 @@ ]]> - - + + diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index 35f767829c5..51b6c0b5d6f 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -113,14 +113,8 @@ public class XmlBeanFactoryTests { private static final ClassPathResource NO_SUCH_FACTORY_METHOD_CONTEXT = classPathResource("-noSuchFactoryMethod.xml"); private static final ClassPathResource RECURSIVE_IMPORT_CONTEXT = classPathResource("-recursiveImport.xml"); private static final ClassPathResource RESOURCE_CONTEXT = classPathResource("-resource.xml"); - private static final ClassPathResource SATISFIED_ALL_DEP_CONTEXT = classPathResource("-satisfiedAllDepCheck.xml"); - private static final ClassPathResource SATISFIED_OBJECT_DEP_CONTEXT = classPathResource("-satisfiedObjectDepCheck.xml"); - private static final ClassPathResource SATISFIED_SIMPLE_DEP_CONTEXT = classPathResource("-satisfiedSimpleDepCheck.xml"); private static final ClassPathResource TEST_WITH_DUP_NAMES_CONTEXT = classPathResource("-testWithDuplicateNames.xml"); private static final ClassPathResource TEST_WITH_DUP_NAME_IN_ALIAS_CONTEXT = classPathResource("-testWithDuplicateNameInAlias.xml"); - private static final ClassPathResource UNSATISFIED_ALL_DEP_CONTEXT = classPathResource("-unsatisfiedAllDepCheckMissingObjects.xml"); - private static final ClassPathResource UNSATISFIED_OBJECT_DEP_CONTEXT = classPathResource("-unsatisfiedObjectDepCheck.xml"); - private static final ClassPathResource UNSATISFIED_SIMPLE_DEP_CONTEXT = classPathResource("-unsatisfiedSimpleDepCheck.xml"); private static final ClassPathResource REFTYPES_CONTEXT = classPathResource("-reftypes.xml"); private static final ClassPathResource DEFAULT_LAZY_CONTEXT = classPathResource("-defaultLazyInit.xml"); private static final ClassPathResource DEFAULT_AUTOWIRE_CONTEXT = classPathResource("-defaultAutowire.xml"); @@ -776,54 +770,6 @@ public class XmlBeanFactoryTests { new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INVALID_CONTEXT); } - @Test(expected = UnsatisfiedDependencyException.class) - public void unsatisfiedObjectDependencyCheck() throws Exception { - DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); - new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(UNSATISFIED_OBJECT_DEP_CONTEXT); - xbf.getBean("a", DependenciesBean.class); - } - - @Test(expected = UnsatisfiedDependencyException.class) - public void unsatisfiedSimpleDependencyCheck() throws Exception { - DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); - new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(UNSATISFIED_SIMPLE_DEP_CONTEXT); - xbf.getBean("a", DependenciesBean.class); - } - - @Test - public void testSatisfiedObjectDependencyCheck() throws Exception { - DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); - new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(SATISFIED_OBJECT_DEP_CONTEXT); - DependenciesBean a = (DependenciesBean) xbf.getBean("a"); - assertNotNull(a.getSpouse()); - assertEquals(xbf, a.getBeanFactory()); - } - - @Test - public void testSatisfiedSimpleDependencyCheck() throws Exception { - DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); - new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(SATISFIED_SIMPLE_DEP_CONTEXT); - DependenciesBean a = (DependenciesBean) xbf.getBean("a"); - assertEquals(a.getAge(), 33); - } - - @Test(expected = UnsatisfiedDependencyException.class) - public void unsatisfiedAllDependencyCheck() throws Exception { - DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); - new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(UNSATISFIED_ALL_DEP_CONTEXT); - xbf.getBean("a", DependenciesBean.class); - } - - @Test - public void testSatisfiedAllDependencyCheck() throws Exception { - DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); - new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(SATISFIED_ALL_DEP_CONTEXT); - DependenciesBean a = (DependenciesBean) xbf.getBean("a"); - assertEquals(a.getAge(), 33); - assertNotNull(a.getName()); - assertNotNull(a.getSpouse()); - } - @Test public void testAutowire() throws Exception { DefaultListableBeanFactory xbf = new DefaultListableBeanFactory(); @@ -909,13 +855,6 @@ public class XmlBeanFactoryTests { // should have been autowired assertNotNull(rod2.getSpouse()); assertTrue(rod2.getSpouse().getName().equals("Kerry")); - - try { - xbf.getBean("rod3", DependenciesBean.class); - fail("Must have thrown UnsatisfiedDependencyException"); - } - catch (UnsatisfiedDependencyException expected) { - } } @Test diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java index bef499ff74e..92c78a8a6ba 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserBeanDefinitionDefaultsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -152,32 +152,6 @@ public class ComponentScanParserBeanDefinitionDefaultsTests { assertNull("property dependencies should not have been autowired", bean.getPropertyDependency2()); } - @Test - public void testDependencyCheckAll() { - GenericApplicationContext context = new GenericApplicationContext(); - XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); - reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultDependencyCheckAllTests.xml"); - try { - context.refresh(); - fail("expected exception due to dependency check"); - } - catch (UnsatisfiedDependencyException ex) { - // expected - } - } - - @Test - public void testDependencyCheckObjectsWithAutowireByName() { - GenericApplicationContext context = new GenericApplicationContext(); - XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(context); - reader.loadBeanDefinitions(LOCATION_PREFIX + "defaultDependencyCheckObjectsWithAutowireByNameTests.xml"); - context.refresh(); - DefaultsTestBean bean = (DefaultsTestBean) context.getBean(TEST_BEAN_NAME); - assertNull("constructor dependency should not have been autowired", bean.getConstructorDependency()); - assertNotNull("property dependencies should have been autowired", bean.getPropertyDependency1()); - assertNotNull("property dependencies should have been autowired", bean.getPropertyDependency2()); - } - @Test public void testDefaultInitAndDestroyMethodsNotDefined() { GenericApplicationContext context = new GenericApplicationContext(); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index 10d7c7ac1ca..48f74e92479 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -541,15 +541,6 @@ public class GroovyScriptFactoryTests { ContextScriptBean bean2 = (ContextScriptBean) ctx.getBean("bean2"); assertEquals(tb, bean2.getTestBean()); assertEquals(ctx, bean2.getApplicationContext()); - - try { - ctx.getBean("bean3"); - fail("Should have thrown BeanCreationException"); - } - catch (BeanCreationException ex) { - // expected - assertTrue(ex.contains(UnsatisfiedDependencyException.class)); - } } @Test diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml b/spring-context/src/test/resources/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml index 1994ce20287..6c2dea2ecb0 100644 --- a/spring-context/src/test/resources/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml +++ b/spring-context/src/test/resources/org/springframework/aop/framework/CglibProxyTests-with-dependency-checking.xml @@ -1,7 +1,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml index 7675fe6e0e4..dcd98c1dce2 100644 --- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml @@ -13,7 +13,7 @@ org.springframework.tests.sample.beans.ITestBean - + debugInterceptor @@ -59,7 +59,7 @@ true - + debugInterceptor @@ -115,7 +115,7 @@ class="org.springframework.aop.framework.ProxyFactoryBean" > org.springframework.tests.sample.beans.ITestBean - + --> @@ -160,7 +160,7 @@ false - + prototypeLockMixinInterceptor diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml index 7eccd715a7d..4830b277de5 100644 --- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml +++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml @@ -22,7 +22,7 @@ - + @@ -45,7 +45,7 @@ org.springframework.tests.sample.beans.ITestBean adam - + diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml index d0f5a89896c..ef9d08cf783 100644 --- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml +++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml @@ -18,7 +18,7 @@ > org.springframework.tests.sample.beans.ITestBean - + debugInterceptor true true diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml index 07f2825c1fc..6a7c5ba2156 100644 --- a/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml +++ b/spring-context/src/test/resources/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml @@ -25,7 +25,7 @@ in a BeanFactory. If for some strange reason you want to, use Type 3 IoC. --> - + - + diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml b/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml index 41480a512ef..166a791762c 100644 --- a/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml +++ b/spring-context/src/test/resources/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml @@ -8,7 +8,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml index 0dbe5be5fb9..4d601a614cf 100644 --- a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml +++ b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-custom-targetsource.xml @@ -14,17 +14,17 @@ Rod - + Rod - + Rod - + diff --git a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml index d3416282a7f..b945183bf91 100644 --- a/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml +++ b/spring-context/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-quick-targetsource.xml @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@ Rod - + @@ -26,19 +26,19 @@ Rod - + Rod - + Rod - + diff --git a/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml index 23f3e51230a..152d52ce252 100644 --- a/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/aop/target/CommonsPool2TargetSourceTests-context.xml @@ -13,7 +13,7 @@ - + getPoolingConfigMixin @@ -23,16 +23,16 @@ This will create a bean for each thread ("apartment") --> - + nop - + - + poolConfigAdvisor @@ -50,7 +50,7 @@ - + serializableNop diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml index ab468576a51..3459958c49a 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml @@ -17,7 +17,7 @@ - + true interceptor diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml index 43510574bae..3c6b50bf555 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml @@ -3,38 +3,31 @@ - + - + - + - + - + - + - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml index 7729dbc7882..698a647e527 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml @@ -8,7 +8,7 @@ 30 - + @@ -29,8 +29,8 @@ List of Rod's friends - - + + @@ -40,7 +40,7 @@ 30 - + @@ -54,8 +54,8 @@ 32 - - + + @@ -69,7 +69,7 @@ My List - + @@ -77,10 +77,10 @@ - + literal - - + + @@ -88,9 +88,9 @@ - + literal - + @@ -102,7 +102,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -174,16 +174,16 @@ bar - + zero bar - + - + ba @@ -192,7 +192,7 @@ bar - + @@ -211,7 +211,7 @@ bar - + @@ -247,7 +247,7 @@ one - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml index f041b65634b..0e0601de77d 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml @@ -23,7 +23,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml index d7241c9c922..b8b7becf96e 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml @@ -81,7 +81,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml index 07501022a52..e244dd950c6 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml @@ -28,7 +28,7 @@ class="org.springframework.beans.factory.xml.FactoryMethods" factory-method="newInstance" scope="prototype"> - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml index 3815538559d..77a665235b6 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml @@ -1,7 +1,7 @@ - + @@ -15,7 +15,7 @@ - + Kerry diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml index 0cd946cc2bd..a814c13e007 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml @@ -64,7 +64,7 @@ 30 - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml index 89b6f142db5..de87d69fbc0 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCarg.xml @@ -4,8 +4,8 @@ - - + + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml index e8754f4c878..825032f6ca3 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depCargInner.xml @@ -6,8 +6,8 @@ - - + + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml index d194b0e8677..1c8e8426853 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml @@ -13,7 +13,7 @@ - + org.springframework.beans.factory.xml.DummyBo diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml index 67f73e29441..ee84922cf9e 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depProp.xml @@ -4,8 +4,8 @@ - - + + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml index 92968cf72b4..ad1937cf623 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInTheMiddle.xml @@ -4,12 +4,12 @@ - + - - + + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml index d4100fbd1e7..2ecc980bae5 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depPropInner.xml @@ -6,8 +6,8 @@ - - + + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml index 86da8d595d4..d32c44f4ba3 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml @@ -4,7 +4,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml index 41ef4c71ecb..56949cc5d85 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalid.xml @@ -9,7 +9,7 @@ 30 - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml index 5fd7f5b40db..57e9e7e9fb8 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml @@ -18,7 +18,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml index 496636214fa..f45eea0faf9 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd"> - + @@ -16,20 +16,20 @@ - + - + - + - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml index 739565b06a3..114c4e54029 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml @@ -39,7 +39,7 @@ Jenny 30 - + @@ -56,7 +56,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml index 2f369564bf4..c9c7ca2400c 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml @@ -5,7 +5,7 @@ Jenny 30 - + @@ -17,7 +17,7 @@ Andrew 36 - + @@ -29,7 +29,7 @@ Georgia 33 - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml deleted file mode 100644 index 18f3c8e1b8b..00000000000 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - 33 - Rod - - - - - - diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml deleted file mode 100644 index a2dcc804188..00000000000 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml deleted file mode 100644 index 9088b962e0f..00000000000 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - 33 - Rod - - - - diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml deleted file mode 100644 index 3178c38e146..00000000000 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - 33 - Rod - - - - - diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml deleted file mode 100644 index 1a7bbf9c7c5..00000000000 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - tony - --> - - - - - - diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml deleted file mode 100644 index a96c4d303d8..00000000000 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml deleted file mode 100644 index 4968b12b3a6..00000000000 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml b/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml index 81770ea423f..7354bff0ca2 100644 --- a/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml +++ b/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml @@ -8,7 +8,7 @@ 30 - + @@ -29,8 +29,8 @@ List of Rod's friends - - + + @@ -40,7 +40,7 @@ 30 - + @@ -54,8 +54,8 @@ 32 - - + + @@ -69,7 +69,7 @@ My List - + @@ -77,10 +77,10 @@ - + literal - - + + @@ -88,9 +88,9 @@ - + literal - + @@ -102,7 +102,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -174,16 +174,16 @@ bar - + zero bar - + - + ba @@ -192,7 +192,7 @@ bar - + @@ -211,7 +211,7 @@ bar - + @@ -247,7 +247,7 @@ one - + diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml deleted file mode 100644 index c5a1c36a971..00000000000 --- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckAllTests.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml b/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml deleted file mode 100644 index 0a9babdbd21..00000000000 --- a/spring-context/src/test/resources/org/springframework/context/annotation/defaultDependencyCheckObjectsWithAutowireByNameTests.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/spring-context/src/test/resources/org/springframework/context/support/test/contextA.xml b/spring-context/src/test/resources/org/springframework/context/support/test/contextA.xml index 203e7a61c6f..b1e34de9842 100644 --- a/spring-context/src/test/resources/org/springframework/context/support/test/contextA.xml +++ b/spring-context/src/test/resources/org/springframework/context/support/test/contextA.xml @@ -15,7 +15,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/applicationContext.xml b/spring-context/src/test/resources/org/springframework/jmx/applicationContext.xml index d9a4d10cc79..26d3c976f3e 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/applicationContext.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/applicationContext.xml @@ -7,7 +7,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/annotation/annotations.xml b/spring-context/src/test/resources/org/springframework/jmx/export/annotation/annotations.xml index 0124173f05c..f1f761fa888 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/annotation/annotations.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/annotation/annotations.xml @@ -7,15 +7,15 @@ - + - + - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssembler.xml index 0e0ca9a6f3a..9c38144e459 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssembler.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssembler.xml @@ -7,7 +7,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml index 5246986ac05..1ee68ab2679 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml @@ -7,7 +7,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml index 1d8df62050b..7bbd4590c15 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml @@ -7,7 +7,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadata-autodetect.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadata-autodetect.xml index c90c5284c21..4c4912a4b14 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadata-autodetect.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadata-autodetect.xml @@ -5,10 +5,10 @@ - + - + @@ -23,13 +23,13 @@ - + - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadataAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadataAssembler.xml index c43e200a596..826ecdfb389 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadataAssembler.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/metadataAssembler.xml @@ -7,12 +7,12 @@ - + - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssembler.xml index 20554a2a311..e2e5427c844 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssembler.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssembler.xml @@ -7,7 +7,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml index 98944a99845..2f98c05e725 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml @@ -7,7 +7,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/reflectiveAssembler.xml b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/reflectiveAssembler.xml index e61a8eb0ad2..60e3f3cbb71 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/assembler/reflectiveAssembler.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/assembler/reflectiveAssembler.xml @@ -5,7 +5,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/excludedBeans.xml b/spring-context/src/test/resources/org/springframework/jmx/export/excludedBeans.xml index 6dc3aba71f9..ad8894cb3d6 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/excludedBeans.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/excludedBeans.xml @@ -7,7 +7,7 @@ - + true @@ -20,7 +20,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml b/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml index 79790d3963b..35562ce2388 100644 --- a/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml +++ b/spring-context/src/test/resources/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml @@ -27,7 +27,7 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml b/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml index 60ea74676e9..dac8e828d4c 100644 --- a/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml +++ b/spring-context/src/test/resources/org/springframework/scripting/bsh/bsh-with-xsd.xml @@ -29,7 +29,7 @@ + autowire="byType" init-method="init" destroy-method="destroy"> - + @@ -14,7 +14,7 @@ - + diff --git a/spring-jdbc/src/main/resources/META-INF/spring.schemas b/spring-jdbc/src/main/resources/META-INF/spring.schemas index d0396fe1cf4..bb50ce33224 100644 --- a/spring-jdbc/src/main/resources/META-INF/spring.schemas +++ b/spring-jdbc/src/main/resources/META-INF/spring.schemas @@ -1,8 +1,8 @@ -http\://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd=org/springframework/jdbc/config/spring-jdbc-3.0.xsd -http\://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd=org/springframework/jdbc/config/spring-jdbc-3.1.xsd -http\://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd=org/springframework/jdbc/config/spring-jdbc-3.2.xsd -http\://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd=org/springframework/jdbc/config/spring-jdbc-4.0.xsd -http\://www.springframework.org/schema/jdbc/spring-jdbc-4.1.xsd=org/springframework/jdbc/config/spring-jdbc-4.1.xsd -http\://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd=org/springframework/jdbc/config/spring-jdbc-4.2.xsd -http\://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd=org/springframework/jdbc/config/spring-jdbc-4.3.xsd -http\://www.springframework.org/schema/jdbc/spring-jdbc.xsd=org/springframework/jdbc/config/spring-jdbc-4.3.xsd +http\://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd=org/springframework/jdbc/config/spring-jdbc.xsd +http\://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd=org/springframework/jdbc/config/spring-jdbc.xsd +http\://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd=org/springframework/jdbc/config/spring-jdbc.xsd +http\://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd=org/springframework/jdbc/config/spring-jdbc.xsd +http\://www.springframework.org/schema/jdbc/spring-jdbc-4.1.xsd=org/springframework/jdbc/config/spring-jdbc.xsd +http\://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd=org/springframework/jdbc/config/spring-jdbc.xsd +http\://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd=org/springframework/jdbc/config/spring-jdbc.xsd +http\://www.springframework.org/schema/jdbc/spring-jdbc.xsd=org/springframework/jdbc/config/spring-jdbc.xsd diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd deleted file mode 100644 index 1b1ad19b609..00000000000 --- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.0.xsd +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - elements. - ]]> - - - - - - - - - - - - - - - - - - - - - - Is this bean "enabled", meaning the scripts will be executed? - Defaults to true, but can be used to switch on and off the initialization depending on the environment. - - - - - - - Should failed SQL statements be ignored during initialization? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd deleted file mode 100644 index 9b8edee5ac6..00000000000 --- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.1.xsd +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - elements. - ]]> - - - - - - - - - - - - - - - - - - - - - - Is this bean "enabled", meaning the scripts will be executed? - Defaults to true, but can be used to switch on and off the initialization depending on the environment. - - - - - - - Should failed SQL statements be ignored during initialization? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd deleted file mode 100644 index a6618a59188..00000000000 --- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - elements. - ]]> - - - - - - - - - - - - - - - - - - - - - - Is this bean "enabled", meaning the scripts will be executed? - Defaults to true, but can be used to switch on and off the initialization depending on the environment. - - - - - - - Should failed SQL statements be ignored during initialization? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.0.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.0.xsd deleted file mode 100644 index 7ff5db8b5ee..00000000000 --- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.0.xsd +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - elements. - ]]> - - - - - - - - - - - - - - - - - - - - - - Is this bean "enabled", meaning the scripts will be executed? - Defaults to true, but can be used to switch on and off the initialization depending on the environment. - - - - - - - Should failed SQL statements be ignored during initialization? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.1.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.1.xsd deleted file mode 100644 index 60d395843ea..00000000000 --- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.1.xsd +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - elements. - ]]> - - - - - - - - - - - - - - - - - - - - - - Is this bean "enabled", meaning the scripts will be executed? - Defaults to true, but can be used to switch on and off the initialization depending on the environment. - - - - - - - Should failed SQL statements be ignored during initialization? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.2.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.2.xsd deleted file mode 100644 index c5f03511f4f..00000000000 --- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.2.xsd +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - If set to "true", a pseudo-random unique name will be generated for the embedded - database, overriding any implicit name provided via the 'id' attribute or any - explicit name provided via the 'database-name' attribute. - Note that this is not the bean name but rather the name of the embedded database - as used in the JDBC connection URL for the database. - - - - - - - - - - - - - - - - elements. - ]]> - - - - - - - - - - - - - - - - - - - - - - Is this bean "enabled", meaning the scripts will be executed? - Defaults to true but can be used to switch on and off script execution - depending on the environment. - - - - - - - Should failed SQL statements be ignored during execution? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.3.xsd b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.xsd similarity index 99% rename from spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.3.xsd rename to spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.xsd index ab76e90f3b7..e2205703122 100644 --- a/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-4.3.xsd +++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + diff --git a/spring-jms/src/main/resources/META-INF/spring.schemas b/spring-jms/src/main/resources/META-INF/spring.schemas index ffcc14f6ff0..84a85293530 100644 --- a/spring-jms/src/main/resources/META-INF/spring.schemas +++ b/spring-jms/src/main/resources/META-INF/spring.schemas @@ -1,9 +1,9 @@ -http\://www.springframework.org/schema/jms/spring-jms-2.5.xsd=org/springframework/jms/config/spring-jms-2.5.xsd -http\://www.springframework.org/schema/jms/spring-jms-3.0.xsd=org/springframework/jms/config/spring-jms-3.0.xsd -http\://www.springframework.org/schema/jms/spring-jms-3.1.xsd=org/springframework/jms/config/spring-jms-3.1.xsd -http\://www.springframework.org/schema/jms/spring-jms-3.2.xsd=org/springframework/jms/config/spring-jms-3.2.xsd -http\://www.springframework.org/schema/jms/spring-jms-4.0.xsd=org/springframework/jms/config/spring-jms-4.0.xsd -http\://www.springframework.org/schema/jms/spring-jms-4.1.xsd=org/springframework/jms/config/spring-jms-4.1.xsd -http\://www.springframework.org/schema/jms/spring-jms-4.2.xsd=org/springframework/jms/config/spring-jms-4.2.xsd -http\://www.springframework.org/schema/jms/spring-jms-4.3.xsd=org/springframework/jms/config/spring-jms-4.3.xsd -http\://www.springframework.org/schema/jms/spring-jms.xsd=org/springframework/jms/config/spring-jms-4.3.xsd +http\://www.springframework.org/schema/jms/spring-jms-2.5.xsd=org/springframework/jms/config/spring-jms.xsd +http\://www.springframework.org/schema/jms/spring-jms-3.0.xsd=org/springframework/jms/config/spring-jms.xsd +http\://www.springframework.org/schema/jms/spring-jms-3.1.xsd=org/springframework/jms/config/spring-jms.xsd +http\://www.springframework.org/schema/jms/spring-jms-3.2.xsd=org/springframework/jms/config/spring-jms.xsd +http\://www.springframework.org/schema/jms/spring-jms-4.0.xsd=org/springframework/jms/config/spring-jms.xsd +http\://www.springframework.org/schema/jms/spring-jms-4.1.xsd=org/springframework/jms/config/spring-jms.xsd +http\://www.springframework.org/schema/jms/spring-jms-4.2.xsd=org/springframework/jms/config/spring-jms.xsd +http\://www.springframework.org/schema/jms/spring-jms-4.3.xsd=org/springframework/jms/config/spring-jms.xsd +http\://www.springframework.org/schema/jms/spring-jms.xsd=org/springframework/jms/config/spring-jms.xsd diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd deleted file mode 100644 index 5976262b65a..00000000000 --- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-2.5.xsd +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd deleted file mode 100644 index 24f2d63fcfb..00000000000 --- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.0.xsd +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.1.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.1.xsd deleted file mode 100644 index 5882cd02f08..00000000000 --- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.1.xsd +++ /dev/null @@ -1,479 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.2.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.2.xsd deleted file mode 100644 index a8b3557a218..00000000000 --- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.2.xsd +++ /dev/null @@ -1,479 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index b959db6df04..00000000000 --- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.0.xsd +++ /dev/null @@ -1,487 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.1.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.1.xsd deleted file mode 100644 index 8b93766fbab..00000000000 --- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.1.xsd +++ /dev/null @@ -1,610 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.3.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.3.xsd deleted file mode 100644 index 223c63bfd66..00000000000 --- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.3.xsd +++ /dev/null @@ -1,638 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.2.xsd b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.xsd similarity index 99% rename from spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.2.xsd rename to spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.xsd index 5122b3c44c0..b248a4c792a 100644 --- a/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.2.xsd +++ b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms.xsd @@ -7,7 +7,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - + Kerry 34 - + @@ -68,7 +68,7 @@ typeMismatch 34x - + @@ -96,20 +96,20 @@ repeated references to the same FactoryBean --> - + - + - + diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java index 9fdc18f800b..d1f23ea25d8 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java @@ -43,10 +43,6 @@ class Jaxb2MarshallerBeanDefinitionParser extends AbstractSingleBeanDefinitionPa @Override protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder beanDefinitionBuilder) { String contextPath = element.getAttribute("context-path"); - if (!StringUtils.hasText(contextPath)) { - // Backwards compatibility with 3.x version of the xsd - contextPath = element.getAttribute("contextPath"); - } if (StringUtils.hasText(contextPath)) { beanDefinitionBuilder.addPropertyValue("contextPath", contextPath); } diff --git a/spring-oxm/src/main/resources/META-INF/spring.schemas b/spring-oxm/src/main/resources/META-INF/spring.schemas index 48ab1cfbdc9..511ac0a32b0 100644 --- a/spring-oxm/src/main/resources/META-INF/spring.schemas +++ b/spring-oxm/src/main/resources/META-INF/spring.schemas @@ -1,8 +1,8 @@ -http\://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=org/springframework/oxm/config/spring-oxm-3.0.xsd -http\://www.springframework.org/schema/oxm/spring-oxm-3.1.xsd=org/springframework/oxm/config/spring-oxm-3.1.xsd -http\://www.springframework.org/schema/oxm/spring-oxm-3.2.xsd=org/springframework/oxm/config/spring-oxm-3.2.xsd -http\://www.springframework.org/schema/oxm/spring-oxm-4.0.xsd=org/springframework/oxm/config/spring-oxm-4.0.xsd -http\://www.springframework.org/schema/oxm/spring-oxm-4.1.xsd=org/springframework/oxm/config/spring-oxm-4.1.xsd -http\://www.springframework.org/schema/oxm/spring-oxm-4.2.xsd=org/springframework/oxm/config/spring-oxm-4.2.xsd -http\://www.springframework.org/schema/oxm/spring-oxm-4.3.xsd=org/springframework/oxm/config/spring-oxm-4.3.xsd -http\://www.springframework.org/schema/oxm/spring-oxm.xsd=org/springframework/oxm/config/spring-oxm-4.3.xsd +http\://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd=org/springframework/oxm/config/spring-oxm.xsd +http\://www.springframework.org/schema/oxm/spring-oxm-3.1.xsd=org/springframework/oxm/config/spring-oxm.xsd +http\://www.springframework.org/schema/oxm/spring-oxm-3.2.xsd=org/springframework/oxm/config/spring-oxm.xsd +http\://www.springframework.org/schema/oxm/spring-oxm-4.0.xsd=org/springframework/oxm/config/spring-oxm.xsd +http\://www.springframework.org/schema/oxm/spring-oxm-4.1.xsd=org/springframework/oxm/config/spring-oxm.xsd +http\://www.springframework.org/schema/oxm/spring-oxm-4.2.xsd=org/springframework/oxm/config/spring-oxm.xsd +http\://www.springframework.org/schema/oxm/spring-oxm-4.3.xsd=org/springframework/oxm/config/spring-oxm.xsd +http\://www.springframework.org/schema/oxm/spring-oxm.xsd=org/springframework/oxm/config/spring-oxm.xsd diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd deleted file mode 100644 index c8442c5a0b4..00000000000 --- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.0.xsd +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - 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. - - - - - - - - - - - - - - - - A class supported by a marshaller. - - - - - - - - - - - diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd deleted file mode 100644 index b3807913ceb..00000000000 --- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.1.xsd +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - 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-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd deleted file mode 100644 index 74eaedead88..00000000000 --- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - 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-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 deleted file mode 100644 index 353b1b4bae2..00000000000 --- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.0.xsd +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - Defines the elements used in Spring's Object/XML Mapping integration. - - - - - - - - Defines a JAXB2 Marshaller. - - - - - - - - - - - - - - - - - - - The JAXB context path. - - - - - - - - - - - - Defines a JiBX Marshaller. - - - - - - - - - - - - The target class to be bound with JiBX. - - - - - The target package for the JiBX binding. - - - - - The binding name used by this marshaller. - - - - - - - - - - - - Defines a Castor Marshaller. - - - - - - - - - - - - The encoding to use for stream reading. - - - - - The target class to be bound with the Castor marshaller. - - - - - The target package that contains Castor descriptor classes. - - - - - The path to the Castor mapping file. - - - - - - - - - - - - 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.1.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.1.xsd deleted file mode 100644 index 666a2850394..00000000000 --- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.1.xsd +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - Defines the elements used in Spring's Object/XML Mapping integration. - - - - - - - - Defines a JAXB2 Marshaller. - - - - - - - - - - - - - - - - - - - The JAXB context path. - - - - - - - - - - - - Defines a JiBX Marshaller. - - - - - - - - - - - - The target class to be bound with JiBX. - - - - - The target package for the JiBX binding. - - - - - The binding name used by this marshaller. - - - - - - - - - - - - Defines a Castor Marshaller. - - - - - - - - - - - - The encoding to use for stream reading. - - - - - The target class to be bound with the Castor marshaller. - - - - - The target package that contains Castor descriptor classes. - - - - - The path to the Castor mapping file. - - - - - - - - - - - - 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.3.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.3.xsd deleted file mode 100644 index db17b8ffac9..00000000000 --- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.3.xsd +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - Defines the elements used in Spring's Object/XML Mapping integration. - - - - - - - - Defines a JAXB2 Marshaller. - - - - - - - - - - - - - - - - - - - The JAXB context path. - - - - - - - - - - - - Defines a JiBX Marshaller. - - - - - - - - - - - - The target class to be bound with JiBX. - - - - - The target package for the JiBX binding. - - - - - The binding name used by this marshaller. - - - - - - - - - - - - Defines a Castor Marshaller. - - - - - - - - - - - - The encoding to use for stream reading. - - - - - The target class to be bound with the Castor marshaller. - - - - - The target package that contains Castor descriptor classes. - - - - - The path to the Castor mapping file. - - - - - - - - - - A class supported by a marshaller. - - - - - - - - - - - diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd similarity index 99% rename from spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd rename to spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd index 8e63fdb7ae1..6549841fb58 100644 --- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-4.2.xsd +++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd @@ -6,8 +6,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + diff --git a/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml index 89e76aa79d2..17325b8fd1e 100644 --- a/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml +++ b/spring-oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml @@ -1,11 +1,11 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd"> - + diff --git a/spring-tx/src/main/resources/META-INF/spring.schemas b/spring-tx/src/main/resources/META-INF/spring.schemas index 8ee24855a19..cf64588e78d 100644 --- a/spring-tx/src/main/resources/META-INF/spring.schemas +++ b/spring-tx/src/main/resources/META-INF/spring.schemas @@ -1,10 +1,10 @@ -http\://www.springframework.org/schema/tx/spring-tx-2.0.xsd=org/springframework/transaction/config/spring-tx-2.0.xsd -http\://www.springframework.org/schema/tx/spring-tx-2.5.xsd=org/springframework/transaction/config/spring-tx-2.5.xsd -http\://www.springframework.org/schema/tx/spring-tx-3.0.xsd=org/springframework/transaction/config/spring-tx-3.0.xsd -http\://www.springframework.org/schema/tx/spring-tx-3.1.xsd=org/springframework/transaction/config/spring-tx-3.1.xsd -http\://www.springframework.org/schema/tx/spring-tx-3.2.xsd=org/springframework/transaction/config/spring-tx-3.2.xsd -http\://www.springframework.org/schema/tx/spring-tx-4.0.xsd=org/springframework/transaction/config/spring-tx-4.0.xsd -http\://www.springframework.org/schema/tx/spring-tx-4.1.xsd=org/springframework/transaction/config/spring-tx-4.1.xsd -http\://www.springframework.org/schema/tx/spring-tx-4.2.xsd=org/springframework/transaction/config/spring-tx-4.2.xsd -http\://www.springframework.org/schema/tx/spring-tx-4.3.xsd=org/springframework/transaction/config/spring-tx-4.3.xsd -http\://www.springframework.org/schema/tx/spring-tx.xsd=org/springframework/transaction/config/spring-tx-4.3.xsd +http\://www.springframework.org/schema/tx/spring-tx-2.0.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx-2.5.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx-3.0.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx-3.1.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx-3.2.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx-4.0.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx-4.1.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx-4.2.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx-4.3.xsd=org/springframework/transaction/config/spring-tx.xsd +http\://www.springframework.org/schema/tx/spring-tx.xsd=org/springframework/transaction/config/spring-tx.xsd diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd deleted file mode 100644 index 2d3837e7961..00000000000 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.0.xsd +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd deleted file mode 100644 index 825024c5099..00000000000 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-2.5.xsd +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.0.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.0.xsd deleted file mode 100644 index 398e6f43d40..00000000000 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.0.xsd +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.1.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.1.xsd deleted file mode 100644 index 0ae5641438f..00000000000 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.1.xsd +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.2.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.2.xsd deleted file mode 100644 index 0f651385581..00000000000 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.2.xsd +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 deleted file mode 100644 index c424f9db8f6..00000000000 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.0.xsd +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.2.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.2.xsd deleted file mode 100644 index 04a0e1eb2f0..00000000000 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.2.xsd +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.3.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.3.xsd deleted file mode 100644 index e93e34c6b97..00000000000 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.3.xsd +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.1.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.xsd similarity index 99% rename from spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.1.xsd rename to spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.xsd index 76312f94d21..844fbad1b88 100644 --- a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-4.1.xsd +++ b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + - - + + diff --git a/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml b/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml index defff1ea268..81c9820fbf2 100644 --- a/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml +++ b/spring-tx/src/test/resources/org/springframework/transaction/interceptor/transactionalBeanFactory.xml @@ -11,7 +11,7 @@ custom 666 - + @@ -19,7 +19,7 @@ - + org.springframework.tests.sample.beans.ITestBean.s*=PROPAGATION_MANDATORY @@ -43,7 +43,7 @@ - + PROPAGATION_MANDATORY @@ -54,7 +54,7 @@ - + true - + - + - + true - + - + - + - + - + @@ -109,13 +109,13 @@ The HotSwappableTargetSource is a Type 3 component. --> - + - + - + PROPAGATION_MANDATORY diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java index b45a2d7e66a..6b37c5c0298 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java @@ -195,10 +195,6 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser { Boolean enableMatrixVariables = Boolean.valueOf(element.getAttribute("enable-matrix-variables")); handlerMappingDef.getPropertyValues().add("removeSemicolonContent", !enableMatrixVariables); } - else if (element.hasAttribute("enableMatrixVariables")) { - Boolean enableMatrixVariables = Boolean.valueOf(element.getAttribute("enableMatrixVariables")); - handlerMappingDef.getPropertyValues().add("removeSemicolonContent", !enableMatrixVariables); - } configurePathMatchingProperties(handlerMappingDef, element, parserContext); readerContext.getRegistry().registerBeanDefinition(HANDLER_MAPPING_BEAN_NAME , handlerMappingDef); @@ -238,12 +234,6 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser { Boolean ignoreDefaultModel = Boolean.valueOf(element.getAttribute("ignore-default-model-on-redirect")); handlerAdapterDef.getPropertyValues().add("ignoreDefaultModelOnRedirect", ignoreDefaultModel); } - else if (element.hasAttribute("ignoreDefaultModelOnRedirect")) { - // "ignoreDefaultModelOnRedirect" spelling is deprecated - Boolean ignoreDefaultModel = Boolean.valueOf(element.getAttribute("ignoreDefaultModelOnRedirect")); - handlerAdapterDef.getPropertyValues().add("ignoreDefaultModelOnRedirect", ignoreDefaultModel); - } - if (argumentResolvers != null) { handlerAdapterDef.getPropertyValues().add("customArgumentResolvers", argumentResolvers); } diff --git a/spring-webmvc/src/main/resources/META-INF/spring.schemas b/spring-webmvc/src/main/resources/META-INF/spring.schemas index 53fa926e0c9..c803d5cf45a 100644 --- a/spring-webmvc/src/main/resources/META-INF/spring.schemas +++ b/spring-webmvc/src/main/resources/META-INF/spring.schemas @@ -1,8 +1,8 @@ -http\://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd=org/springframework/web/servlet/config/spring-mvc-3.0.xsd -http\://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd=org/springframework/web/servlet/config/spring-mvc-3.1.xsd -http\://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd=org/springframework/web/servlet/config/spring-mvc-3.2.xsd -http\://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd=org/springframework/web/servlet/config/spring-mvc-4.0.xsd -http\://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd=org/springframework/web/servlet/config/spring-mvc-4.1.xsd -http\://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd=org/springframework/web/servlet/config/spring-mvc-4.2.xsd -http\://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd=org/springframework/web/servlet/config/spring-mvc-4.3.xsd -http\://www.springframework.org/schema/mvc/spring-mvc.xsd=org/springframework/web/servlet/config/spring-mvc-4.3.xsd +http\://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd=org/springframework/web/servlet/config/spring-mvc.xsd +http\://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd=org/springframework/web/servlet/config/spring-mvc.xsd +http\://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd=org/springframework/web/servlet/config/spring-mvc.xsd +http\://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd=org/springframework/web/servlet/config/spring-mvc.xsd +http\://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd=org/springframework/web/servlet/config/spring-mvc.xsd +http\://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd=org/springframework/web/servlet/config/spring-mvc.xsd +http\://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd=org/springframework/web/servlet/config/spring-mvc.xsd +http\://www.springframework.org/schema/mvc/spring-mvc.xsd=org/springframework/web/servlet/config/spring-mvc.xsd diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd deleted file mode 100644 index c47b42e3ae6..00000000000 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.0.xsd +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd deleted file mode 100644 index deb0872de82..00000000000 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.1.xsd +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd deleted file mode 100644 index 2649e87793d..00000000000 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd +++ /dev/null @@ -1,502 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd deleted file mode 100644 index 0ae4616117e..00000000000 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd +++ /dev/null @@ -1,518 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd deleted file mode 100644 index 13cbef1dd54..00000000000 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd +++ /dev/null @@ -1,1114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element - or declare a TilesConfigurer bean. - ]]> - - - - - element - or declare a FreeMarkerConfigurer bean. - ]]> - - - - - element - or declare a VelocityConfigurer bean. - ]]> - - - - - element - or declare a GroovyMarkupConfigurer bean. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.2.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.2.xsd deleted file mode 100644 index 7e32a96ed8b..00000000000 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.2.xsd +++ /dev/null @@ -1,1386 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - element - or declare a TilesConfigurer bean. - ]]> - - - - - element - or declare a FreeMarkerConfigurer bean. - ]]> - - - - - element - or declare a VelocityConfigurer bean. - ]]> - - - - - element - or declare a GroovyMarkupConfigurer bean. - ]]> - - - - - element - or declare a ScriptTemplateConfigurer bean. - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.3.xsd b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd similarity index 99% rename from spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.3.xsd rename to spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd index 50b90323a23..e61eb3ef0fd 100644 --- a/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.3.xsd +++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index f1cec17efe9..d13ee1b25ea 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -278,11 +278,6 @@ public class MvcNamespaceTests { doTestCustomValidator("mvc-config-custom-validator.xml"); } - @Test - public void testCustomValidator32() throws Exception { - doTestCustomValidator("mvc-config-custom-validator-32.xml"); - } - private void doTestCustomValidator(String xml) throws Exception { loadBeanDefinitions(xml, 14); diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml index 1169e1f06f1..ce524fb23f9 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/test-servlet.xml @@ -33,13 +33,13 @@ Kerry 34 - + typeMismatch 34x - + diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/testNamespace.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/testNamespace.xml index 89c42365d4a..30b68a8457e 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/testNamespace.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/testNamespace.xml @@ -11,7 +11,7 @@ Kerry 34 - + diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator-32.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator-32.xml deleted file mode 100644 index 05897f75538..00000000000 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator-32.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml index e29fff1961d..1056903ac98 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml @@ -4,27 +4,27 @@ - - + + - - - - - - - + + + + + + + - - + + - + diff --git a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml index 6af7ed4a280..6c5a368d8d8 100644 --- a/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml +++ b/spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml @@ -4,22 +4,22 @@ - + - - - + + + - - + + - - + + diff --git a/spring-websocket/src/main/resources/META-INF/spring.schemas b/spring-websocket/src/main/resources/META-INF/spring.schemas index 1b557438173..c9350f11f1d 100644 --- a/spring-websocket/src/main/resources/META-INF/spring.schemas +++ b/spring-websocket/src/main/resources/META-INF/spring.schemas @@ -1,5 +1,5 @@ -http\://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd=org/springframework/web/socket/config/spring-websocket-4.0.xsd -http\://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd=org/springframework/web/socket/config/spring-websocket-4.1.xsd -http\://www.springframework.org/schema/websocket/spring-websocket-4.2.xsd=org/springframework/web/socket/config/spring-websocket-4.2.xsd -http\://www.springframework.org/schema/websocket/spring-websocket-4.3.xsd=org/springframework/web/socket/config/spring-websocket-4.3.xsd -http\://www.springframework.org/schema/websocket/spring-websocket.xsd=org/springframework/web/socket/config/spring-websocket-4.3.xsd +http\://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd=org/springframework/web/socket/config/spring-websocket.xsd +http\://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd=org/springframework/web/socket/config/spring-websocket.xsd +http\://www.springframework.org/schema/websocket/spring-websocket-4.2.xsd=org/springframework/web/socket/config/spring-websocket.xsd +http\://www.springframework.org/schema/websocket/spring-websocket-4.3.xsd=org/springframework/web/socket/config/spring-websocket.xsd +http\://www.springframework.org/schema/websocket/spring-websocket.xsd=org/springframework/web/socket/config/spring-websocket.xsd diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd deleted file mode 100644 index 861fd865394..00000000000 --- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd +++ /dev/null @@ -1,684 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.1.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.1.xsd deleted file mode 100644 index 943a7db4861..00000000000 --- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.1.xsd +++ /dev/null @@ -1,861 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.2.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.2.xsd deleted file mode 100644 index f60e11cb668..00000000000 --- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.2.xsd +++ /dev/null @@ -1,924 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.gif b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.gif new file mode 100644 index 00000000000..9e4c800e48d Binary files /dev/null and b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.gif differ diff --git a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.3.xsd b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd similarity index 99% rename from spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.3.xsd rename to spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd index 10348c4ab0e..c6c063bd68a 100644 --- a/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.3.xsd +++ b/spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket.xsd @@ -8,8 +8,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + diff --git a/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml index c5b04a53df3..a35fdce1d04 100644 --- a/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml +++ b/src/test/resources/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml @@ -47,12 +47,12 @@ - - + + - + 10 @@ -66,8 +66,8 @@ scope="prototype"> - - + +