Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start version 5.3

Browse Source 
* Move `What's New` into `changes-5.1-5.2.adoc`
* Remove version from the `XSD` files:
 1. Align with SF
 2. The version for XSD doesn't matter for the current jar version,
 since only the version is available in classpath is from the current
 jar version
 3. Modify `spring.schemas` to map all the possible versions for XSD
 into the current one in a jar.
 This way target applications can upgrade without changing the version
 for XSD location and we don't need to require `versionless` variant
 any more
 4. The jar in classpath can handle only its own XSD, so independently
 of version or no-version variants we still may fail because the current
 jar may not support end-user code any more - need some fix over there
 anyway.
* Remove `checkTestConfigs` Gradle task since we don't worry about XSD
version any more
* Modify `schemaZip` Gradle task to populate XSDs into a distribution
still with a version to avoid overriding on-line XSDs for version `1.0.x`.
We may consider not do that since SF doesn't and just bite a bullet
for always overriding those on-line XSDs to the actual one from the latest
release.
This commit is contained in:
Artem Bilan
2019-11-27 17:51:35 -05:00
parent 1a9fb83199
commit 9dc3519f20
71 changed files with 4106 additions and 3358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-integration-http/src/main/resources/META-INF/spring.schemas
View File

@@ -1,4 +1,24 @@
http\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http-5.2.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-2.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-2.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-3.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-4.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-4.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-4.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-4.3.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-5.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-5.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
http\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-2.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-2.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-3.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-4.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-4.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-4.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-4.3.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-5.0.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-5.1.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http-5.2.xsd=org/springframework/integration/http/config/spring-integration-http.xsd
https\://www.springframework.org/schema/integration/http/spring-integration-http.xsd=org/springframework/integration/http/config/spring-integration-http.xsd

107
spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-5.2.xsd → spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http.xsd
View File

@@ -2,13 +2,12 @@
<xsd:schema xmlns="http://www.springframework.org/schema/integration/http" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:tool="http://www.springframework.org/schema/tool"
xmlns:integration="http://www.springframework.org/schema/integration"
targetNamespace="http://www.springframework.org/schema/integration/http" elementFormDefault="qualified"
attributeFormDefault="unqualified">
targetNamespace="http://www.springframework.org/schema/integration/http" elementFormDefault="qualified">
<xsd:import namespace="http://www.springframework.org/schema/beans" />
<xsd:import namespace="http://www.springframework.org/schema/tool" />
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
<xsd:import namespace="http://www.springframework.org/schema/tool"/>
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="https://www.springframework.org/schema/integration/spring-integration-5.2.xsd" />
schemaLocation="https://www.springframework.org/schema/integration/spring-integration.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[
@@ -37,7 +36,7 @@
<xsd:element name="cross-origin" type="crossOriginType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Marks this endpoint as permitting cross origin requests (CORS).
Marks this endpoint as permitting cross origin requests (CORS).
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -73,12 +72,13 @@
'HttpStatus' value, or use a literal expression e.g. "201".
By default 'status-code-expression' is null, meaning that the default '200 OK' response status
will be returned.
The 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header of the reply
The 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header of the
reply
Message.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="inboundCommonAttributes" />
<xsd:attributeGroup ref="inboundCommonAttributes"/>
</xsd:complexType>
</xsd:element>
@@ -93,11 +93,12 @@
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="gatewayType">
<xsd:sequence>
<xsd:sequence>
<xsd:element name="request-mapping" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
Defines configuration for org.springframework.integration.http.inbound.RequestMapping
Defines configuration for
org.springframework.integration.http.inbound.RequestMapping
as RESTFul attributes for Spring Integration HTTP Inbound Endpoints.
</xsd:documentation>
</xsd:annotation>
@@ -107,10 +108,14 @@
<xsd:attribute name="produces" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
The producible media types of the mapped request, narrowing the primary mapping.
The format is a sequence of media types ("text/plain", "application/*),
with a request only mapped if the Accept matches one of these media types.
Expressions can be negated by using the "!" operator, as in "!text/plain", which matches
The producible media types of the mapped request, narrowing the
primary mapping.
The format is a sequence of media types ("text/plain",
"application/*),
with a request only mapped if the Accept matches one of these media
types.
Expressions can be negated by using the "!" operator, as in
"!text/plain", which matches
all requests with a Accept other than "text/plain".
</xsd:documentation>
</xsd:annotation>
@@ -139,7 +144,7 @@
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel" />
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
@@ -147,7 +152,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attributeGroup ref="inboundCommonAttributes" />
<xsd:attributeGroup ref="inboundCommonAttributes"/>
<xsd:attribute name="extract-reply-payload" type="xsd:string" default="true">
<xsd:annotation>
<xsd:documentation>
@@ -162,7 +167,7 @@
<xsd:documentation>
In the case that a view-name is not specified this attribute can be used to
override the default behaviour when there is a message handling exception (which
is to rethrow). If this flag is true then the normal conversion process will be
is to rethrow). If this flag is true then the normal conversion process will be
applied to the exception and written out to the response body.
</xsd:documentation>
</xsd:annotation>
@@ -214,14 +219,16 @@
a 'reply-timeout'.
The expression must return an object which can be converted to a
'org.springframework.http.HttpStatus' enum value.
The 'evaluationContext' has a 'BeanResolver' but no variables, so the usage of this attribute
The 'evaluationContext' has a 'BeanResolver' but no variables, so the usage of this
attribute
is somewhat limited.
An example might be to resolve, at runtime, some scoped Bean that returns an
'HttpStatus' value, or use a literal expression e.g. "504".
By default 'status-code-expression' is null, meaning that the default
'500 Internal Server Error' response status will be returned after a timeout.
When a timeout is not encountered,
the 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header of the reply
the 'http:inbound-gateway' resolves the 'status code' from the 'http_statusCode' header
of the reply
Message.
</xsd:documentation>
</xsd:annotation>
@@ -248,7 +255,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="httpMethodEnumeration xsd:string" />
<xsd:union memberTypes="httpMethodEnumeration xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="view-name" type="xsd:string">
@@ -329,7 +336,7 @@
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper" />
<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
@@ -353,7 +360,7 @@
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel" />
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
@@ -366,7 +373,7 @@
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.validation.Validator" />
<tool:expected-type type="org.springframework.validation.Validator"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
@@ -394,7 +401,8 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" maxOccurs="1" />
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0"
maxOccurs="1"/>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
<xsd:attributeGroup ref="integration:channelAdapterAttributes"/>
@@ -419,7 +427,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
</xsd:complexType>
@@ -444,15 +452,17 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="transactional" type="integration:transactionalType" minOccurs="0" maxOccurs="1" />
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" maxOccurs="1" />
<xsd:element name="transactional" type="integration:transactionalType" minOccurs="0"
maxOccurs="1"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1"/>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
<xsd:attribute name="request-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel" />
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
@@ -523,7 +533,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
</xsd:extension>
@@ -602,13 +612,13 @@
<xsd:simpleType name="httpMethodEnumeration">
<xsd:restriction base="xsd:token">
<xsd:enumeration value="GET" />
<xsd:enumeration value="POST" />
<xsd:enumeration value="HEAD" />
<xsd:enumeration value="OPTIONS" />
<xsd:enumeration value="PUT" />
<xsd:enumeration value="DELETE" />
<xsd:enumeration value="TRACE" />
<xsd:enumeration value="GET"/>
<xsd:enumeration value="POST"/>
<xsd:enumeration value="HEAD"/>
<xsd:enumeration value="OPTIONS"/>
<xsd:enumeration value="PUT"/>
<xsd:enumeration value="DELETE"/>
<xsd:enumeration value="TRACE"/>
</xsd:restriction>
</xsd:simpleType>
@@ -618,12 +628,12 @@
Defines common configuration for gateway adapters.
</xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id" type="xsd:string" />
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="reply-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.messaging.MessageChannel" />
<tool:expected-type type="org.springframework.messaging.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
@@ -732,7 +742,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="httpMethodEnumeration xsd:string" />
<xsd:union memberTypes="httpMethodEnumeration xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="allow-credentials" default="true">
@@ -745,7 +755,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:boolean xsd:string" />
<xsd:union memberTypes="xsd:boolean xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="max-age" default="1800">
@@ -759,7 +769,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="xsd:long xsd:string" />
<xsd:union memberTypes="xsd:long xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
</xsd:complexType>
@@ -769,7 +779,7 @@
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.web.client.RestTemplate" />
<tool:expected-type type="org.springframework.web.client.RestTemplate"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
@@ -784,7 +794,7 @@
]]></xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.http.client.ClientHttpRequestFactory" />
<tool:expected-type type="org.springframework.http.client.ClientHttpRequestFactory"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -796,7 +806,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.web.client.ResponseErrorHandler" />
<tool:expected-type type="org.springframework.web.client.ResponseErrorHandler"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -848,7 +858,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:simpleType>
<xsd:union memberTypes="httpMethodEnumeration xsd:string" />
<xsd:union memberTypes="httpMethodEnumeration xsd:string"/>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="http-method-expression" type="xsd:string">
@@ -876,7 +886,7 @@
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="direct">
<tool:expected-type type="java.lang.Class" />
<tool:expected-type type="java.lang.Class"/>
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
@@ -884,7 +894,8 @@
<xsd:attribute name="expected-response-type-expression" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
SpEL expression to determine the type for the expected response to which the response body should be converted
SpEL expression to determine the type for the expected response to which the response body should be
converted
The returned value of the expression could be an instance of java.lang.Class or
java.lang.String representing a fully qualified class name.
This attribute cannot be provided if expected-response-type has a value
@@ -895,7 +906,7 @@
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper" />
<tool:expected-type type="org.springframework.integration.mapping.HeaderMapper"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>