INT-3208 Create 4.0 Schemas
Update the spring.schemas files. Update the version in the abstract namespace parser. JIRA: https://jira.springsource.org/browse/INT-3208 The following is a diff showing changes between the 3.0 and 4.0 schemas... ./spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd ./spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" /> ./spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd ./spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd 10c10 < schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd" --- > schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" 13c13 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd 9c9 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd 9c9 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-3.0.xsd 8c8 < schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" /> ./spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-3.0.xsd ./spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" /> ./spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd" /> ./spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/>
This commit is contained in:
Gary Russell
@@ -1,8 +1,10 @@
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-2.1.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-3.0.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-3.0.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-4.0.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-4.0.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.1.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-2.1.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-2.2.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-3.0.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-3.0.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-4.0.xsd
|
||||
http\://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core.xsd=org/springframework/integration/scripting/config/spring-integration-scripting-core-4.0.xsd
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xsd:schema xmlns="http://www.springframework.org/schema/integration/scripting"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
||||
targetNamespace="http://www.springframework.org/schema/integration/scripting"
|
||||
elementFormDefault="qualified" attributeFormDefault="unqualified">
|
||||
|
||||
<xsd:include
|
||||
schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" />
|
||||
|
||||
<xsd:element name="script">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Configures an inner bean that will generate a
|
||||
JSR 223 compliant script.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:element>
|
||||
|
||||
<xsd:complexType name="Jsr223Script">
|
||||
<xsd:complexContent>
|
||||
<xsd:extension base="ScriptType">
|
||||
<xsd:attribute name="lang" use="optional">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
The script language or JSR 223 scripting engine name. Required only for inline scripts. If a script location is
|
||||
referenced, the language may be derived from the file extension
|
||||
(.rb: ruby, .groovy, js: javascript (ECMAScript), .py: python).
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="return" use="optional">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
The script variable to return as a result of the evaluation (Optional).
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
</xsd:extension>
|
||||
</xsd:complexContent>
|
||||
</xsd:complexType>
|
||||
|
||||
|
||||
</xsd:schema>
|
||||
@@ -0,0 +1,95 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xsd:schema
|
||||
xmlns="http://www.springframework.org/schema/integration/scripting"
|
||||
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:beans="http://www.springframework.org/schema/beans"
|
||||
xmlns:tool="http://www.springframework.org/schema/tool"
|
||||
xmlns:integration="http://www.springframework.org/schema/integration"
|
||||
elementFormDefault="qualified" attributeFormDefault="unqualified">
|
||||
|
||||
<xsd:import namespace="http://www.springframework.org/schema/tool" />
|
||||
<xsd:import namespace="http://www.springframework.org/schema/integration"
|
||||
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" />
|
||||
|
||||
|
||||
<xsd:complexType name="ScriptType" mixed="true" abstract="true">
|
||||
<xsd:sequence>
|
||||
<xsd:element name="variable" minOccurs="0" maxOccurs="unbounded">
|
||||
<xsd:complexType>
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Allows you to define custom script variable bindings. The use of this
|
||||
sub-element is mutually
|
||||
exclusive with the 'script-variable-generator' attribute.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:attribute name="name" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Name of the script variable.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="value" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Value of the script variable as a literal.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="ref" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Value of the script variable as a bean reference.
|
||||
</xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:expected-type type="java.lang.Object" />
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="location">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Resource location path for the Script. Either this or an inline script
|
||||
as body text should be provided, but not both.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="script-variable-generator" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Reference to the ScriptVariableGenerator bean. This attribute is mutually
|
||||
exclusive with any 'variable' sub-elements and 'variables' attribute.
|
||||
</xsd:documentation>
|
||||
<xsd:appinfo>
|
||||
<tool:expected-type
|
||||
type="org.springframework.integration.scripting.ScriptVariableGenerator" />
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
|
||||
<xsd:attribute name="refresh-check-delay">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Refresh delay for the script contents if specified as a resource
|
||||
location (defaults to -1, never refresh).
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="variables">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Comma-delimited pairs of variables and their values.
|
||||
the variable name can applies '-ref' suffix, which mean to determine
|
||||
a variable value as a bean reference.
|
||||
This attribute isn't mutually exclusive with 'variable' sub-elements
|
||||
and all variables will be merged to one Map.
|
||||
This attribute is mutually exclusive with 'script-variable-generator' attribute.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
</xsd:complexType>
|
||||
|
||||
</xsd:schema>
|
||||
Reference in New Issue
Block a user