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,2 +1,3 @@
|
||||
http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-3.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd
|
||||
http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd
|
||||
http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog-4.0.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-4.0.xsd
|
||||
http\://www.springframework.org/schema/integration/syslog/spring-integration-syslog.xsd=org/springframework/integration/syslog/config/spring-integration-syslog-4.0.xsd
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xsd:schema xmlns="http://www.springframework.org/schema/integration/ip"
|
||||
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"
|
||||
xmlns:int-ip="http://www.springframework.org/schema/integration/ip"
|
||||
targetNamespace="http://www.springframework.org/schema/integration/syslog"
|
||||
elementFormDefault="qualified" attributeFormDefault="unqualified">
|
||||
|
||||
<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="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" />
|
||||
<xsd:import namespace="http://www.springframework.org/schema/integration/ip"
|
||||
schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd" />
|
||||
|
||||
<xsd:annotation>
|
||||
<xsd:documentation><![CDATA[
|
||||
Defines the configuration elements for Spring Integration's Syslog adapters.
|
||||
]]></xsd:documentation>
|
||||
</xsd:annotation>
|
||||
|
||||
<xsd:element name="inbound-channel-adapter">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence minOccurs="0" maxOccurs="1">
|
||||
<xsd:element name="udp-attributes" type="int-ip:udpInboundAdapterType" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="id" type="xsd:string" />
|
||||
<xsd:attribute name="connection-factory" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type
|
||||
type="org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory" />
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
<xsd:documentation>
|
||||
An explicit tcp connection factory; requires protocol="tcp" and
|
||||
incompatible with the 'port' attribute.
|
||||
Use this if you want to set advanced configuration options on the
|
||||
factory. The default factory uses
|
||||
NIO.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="channel" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type
|
||||
type="org.springframework.messaging.MessageChannel" />
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="error-channel" type="xsd:string">
|
||||
<xsd:annotation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type
|
||||
type="org.springframework.integration.MessageChannel" />
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
<xsd:documentation>
|
||||
If a (synchronous) downstream exception is thrown and an
|
||||
"error-channel" is specified,
|
||||
the MessagingException will be sent to this channel. Otherwise, any
|
||||
such exception
|
||||
will simply be logged by the channel adapter.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="protocol" type="xsd:string" use="optional"
|
||||
default="udp">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
The protocol used to listen for syslog packets, 'udp' or 'tcp'.
|
||||
Default
|
||||
is 'udp'.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="port" type="xsd:string" use="optional">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
The port on which this adapter listens for syslog packets. Default is
|
||||
514. This is
|
||||
standard for UDP, but no standard is esablished for TCP - in many cases
|
||||
514 is
|
||||
used for TCP, but 514 is actually allocated to another protocol.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="converter" type="xsd:string" use="optional">
|
||||
<xsd:annotation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type
|
||||
type="org.springframework.integration.syslog.MessageConverter" />
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
<xsd:documentation>
|
||||
A converter used to map the UDP/TCP message to a Spring Integration
|
||||
message.
|
||||
Default is DefaultSyslogMessageConverter.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="send-timeout" type="xsd:string"
|
||||
use="optional">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
A timeout (milliseconds) when sending messages to 'channel' or
|
||||
'error-channel'. Only
|
||||
applies if the send might block - such as when sending to a bounded
|
||||
QueueChannel that
|
||||
is currently full. Default is infinity.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attributeGroup ref="integration:smartLifeCycleAttributeGroup" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
|
||||
</xsd:schema>
|
||||
Reference in New Issue
Block a user