From 180c5b2ef6c16f66145a4250b597a093e566d922 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 15 Mar 2012 20:59:17 +0200 Subject: [PATCH] Introduce 3.2 versions of Spring XML namespaces Copy spring-*-3.1.xsd => spring-*-3.2.xsd; this commit introduces no substantive changes, but rather prepares for them by creating a clean baseline. All internal references to 3.1 schemas (e.g. spring-tool) have also been updated. --- .../aop/config/spring-aop-3.2.xsd | 410 ++++++ .../beans/factory/xml/spring-beans-3.2.xsd | 1180 +++++++++++++++++ .../beans/factory/xml/spring-tool-3.2.xsd | 115 ++ .../beans/factory/xml/spring-util-3.2.xsd | 212 +++ .../cache/config/spring-cache-3.2.xsd | 235 ++++ .../context/config/spring-context-3.2.xsd | 533 ++++++++ .../ejb/config/spring-jee-3.2.xsd | 267 ++++ .../scheduling/config/spring-task-3.2.xsd | 250 ++++ .../scripting/config/spring-lang-3.2.xsd | 233 ++++ .../jdbc/config/spring-jdbc-3.2.xsd | 181 +++ .../jms/config/spring-jms-3.2.xsd | 480 +++++++ .../oxm/config/spring-oxm-3.2.xsd | 158 +++ .../transaction/config/spring-tx-3.2.xsd | 247 ++++ .../web/servlet/config/spring-mvc-3.2.xsd | 326 +++++ 14 files changed, 4827 insertions(+) create mode 100644 spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.2.xsd create mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.2.xsd create mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.2.xsd create mode 100644 spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd create mode 100644 spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.2.xsd create mode 100644 spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd create mode 100644 spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.2.xsd create mode 100644 spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd create mode 100644 spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd create mode 100644 spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd create mode 100644 spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.2.xsd create mode 100644 spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd create mode 100644 spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.2.xsd create mode 100644 spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd 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 new file mode 100644 index 0000000000..7dae8fc446 --- /dev/null +++ b/spring-aop/src/main/resources/org/springframework/aop/config/spring-aop-3.2.xsd @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000..c8dec32958 --- /dev/null +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-3.2.xsd @@ -0,0 +1,1180 @@ + + + + + + + + + + + + + + + + + + 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 may be parsed. Multiple profiles can be + separated by any number of spaces, commas, or semi-colons (or indeed any mixture of the three). + 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. + + 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-tool-3.2.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.2.xsd new file mode 100644 index 0000000000..9d84906ade --- /dev/null +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-3.2.xsd @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000..f7a754aa6c --- /dev/null +++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-util-3.2.xsd @@ -0,0 +1,212 @@ + + + + + + + + + + + Reference a public, static field on a type and expose its value as + a bean. For example <util:constant static-field="java.lang.Integer.MAX_VALUE"/>. + + + + + + + + + + + + Reference a property on a bean (or as a nested value) and expose its values as + a bean. For example <util:property-path path="order.customer.name"/>. + + + + + + + + + + + + Builds a List instance of the specified type, populated with the specified content. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Builds a Set instance of the specified type, populated with the specified content. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Builds a Map instance of the specified type, populated with the specified content. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Loads a Properties instance from the resource location specified by the 'location' attribute. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.2.xsd b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.2.xsd new file mode 100644 index 0000000000..9bfdf14010 --- /dev/null +++ b/spring-context/src/main/resources/org/springframework/cache/config/spring-cache-3.2.xsd @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000..f63ecc1aaf --- /dev/null +++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-3.2.xsd @@ -0,0 +1,533 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/ejb/config/spring-jee-3.2.xsd b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.2.xsd new file mode 100644 index 0000000000..8dcead927f --- /dev/null +++ b/spring-context/src/main/resources/org/springframework/ejb/config/spring-jee-3.2.xsd @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000..8d17fffb84 --- /dev/null +++ b/spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-3.2.xsd @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000..34e9775fe2 --- /dev/null +++ b/spring-context/src/main/resources/org/springframework/scripting/config/spring-lang-3.2.xsd @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000..d88ac70816 --- /dev/null +++ b/spring-jdbc/src/main/resources/org/springframework/jdbc/config/spring-jdbc-3.2.xsd @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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-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 new file mode 100644 index 0000000000..e4e94b1481 --- /dev/null +++ b/spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-3.2.xsd @@ -0,0 +1,480 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000..74eaedead8 --- /dev/null +++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-3.2.xsd @@ -0,0 +1,158 @@ + + + + + + + + + Defines the elements used in Spring's Object/XML Mapping integration. + + + + + + + + Defines a JAXB2 Marshaller. + + + + + + + + + + + + + + + + + + + The JAXB Context path + + + + + + + + + + + + Defines a JiBX Marshaller. + + + + + + + + + + + + + The binding name used by this marshaller. + + + + + + + + + + + + Defines a XMLBeans Marshaller. + + + + + + + + + + + + + The bean name of the XmlOptions that is to be used for this marshaller. Typically a + XmlOptionsFactoryBean definition. + + + + + + + + + + + + + + + + + + Defines a Castor Marshaller. + + + + + + + + + + + + The encoding to use for stream reading. + + + + + The target class to be bound with Castor marshaller. + + + + + The target package that contains Castor descriptor classes. + + + + + The path to Castor mapping file. + + + + + + + + + + A class supported by a marshaller. + + + + + + + + + + + diff --git a/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.2.xsd b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.2.xsd new file mode 100644 index 0000000000..0f65138558 --- /dev/null +++ b/spring-tx/src/main/resources/org/springframework/transaction/config/spring-tx-3.2.xsd @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000000..23d0aaf41d --- /dev/null +++ b/spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd @@ -0,0 +1,326 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +