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

INT-3418: Final Phase: Cleanup

Browse Source 
INT-3418: use versioned XSDs for XSD import
This commit is contained in:
Artem Bilan
2014-05-30 21:05:25 +03:00
committed by Gary Russell
parent 77b31f58fd
commit f5145f531b
29 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -101,7 +101,7 @@ subprojects { subproject ->
openJpaVersion = '2.3.0'
pahoMqttClientVersion = '0.4.0'
postgresVersion = '9.1-901-1.jdbc4'
reactorVersion = '1.1.0.RELEASE'
reactorVersion = '1.1.2.RELEASE'
romeVersion = '1.0.0'
saajApiVersion = '1.3.5'
saajImplVersion = '1.3.23'

2
spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.1.xsd
View File

@@ -9,7 +9,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:element name="outbound-channel-adapter">
<xsd:annotation>

2
spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-4.1.xsd
View File

@@ -8,7 +8,7 @@
<xsd:import namespace="http://www.springframework.org/schema/beans" />
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-4.1.xsd
View File

@@ -9,7 +9,7 @@
<xsd:import namespace="http://www.springframework.org/schema/beans" />
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:element name="inbound-channel-adapter">
<xsd:annotation>

2
spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-4.1.xsd
View File

@@ -10,7 +10,7 @@
<xsd:import namespace="http://www.springframework.org/schema/beans"/>
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[

4
spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-4.1.xsd
View File

@@ -10,9 +10,9 @@
<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" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/integration/file"
schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd" />
<xsd:element name="outbound-channel-adapter">
<xsd:annotation>

2
spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-4.1.xsd
View File

@@ -10,7 +10,7 @@
schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd" />
<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.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[
Defines the core configuration elements for Spring Integration GemFire Support.

5
spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-4.1.xsd
View File

@@ -7,10 +7,11 @@
elementFormDefault="qualified" attributeFormDefault="unqualified">
<xsd:include
schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd"
schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.1.xsd"
/>
<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"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:element name="script" type="GroovyScript">
<xsd:annotation>

2
spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-4.1.xsd
View File

@@ -8,7 +8,7 @@
<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" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.1.xsd
View File

@@ -9,7 +9,7 @@
<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" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

3
spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-4.1.xsd
View File

@@ -6,7 +6,8 @@
<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"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-4.1.xsd
View File

@@ -11,7 +11,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[

3
spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-4.1.xsd
View File

@@ -6,7 +6,8 @@
<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"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-4.1.xsd
View File

@@ -9,7 +9,7 @@
<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" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-4.1.xsd
View File

@@ -11,7 +11,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-4.1.xsd
View File

@@ -8,7 +8,7 @@
<xsd:import namespace="http://www.springframework.org/schema/beans" />
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.1.xsd
View File

@@ -9,7 +9,7 @@
<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.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-4.1.xsd
View File

@@ -8,7 +8,7 @@
<xsd:import namespace="http://www.springframework.org/schema/beans" />
<xsd:import namespace="http://www.springframework.org/schema/integration"
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-4.1.xsd
View File

@@ -11,7 +11,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-4.1.xsd
View File

@@ -5,7 +5,7 @@
elementFormDefault="qualified" attributeFormDefault="unqualified">
<xsd:include
schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.1.xsd" />
<xsd:element name="script">
<xsd:annotation>

2
spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-4.1.xsd
View File

@@ -8,7 +8,7 @@
<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" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:complexType name="ScriptType" mixed="true" abstract="true">

4
spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-4.1.xsd
View File

@@ -10,9 +10,9 @@
<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" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd" />
<xsd:import namespace="http://www.springframework.org/schema/integration/file"
schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" />
schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.1.xsd" />
<xsd:element name="outbound-channel-adapter">
<xsd:annotation>

2
spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-4.1.xsd
View File

@@ -11,7 +11,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[

4
spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-4.1.xsd
View File

@@ -10,9 +10,9 @@
<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" />
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.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" />
schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-4.1.xsd" />
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-4.1.xsd
View File

@@ -11,7 +11,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<!--
INBOUND

2
spring-integration-websocket/src/main/resources/org/springframework/integration/websocket/config/spring-integration-websocket-4.1.xsd
View File

@@ -11,7 +11,7 @@
<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.xsd"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-4.1.xsd
View File

@@ -11,7 +11,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:annotation>
<xsd:documentation><![CDATA[

2
spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-4.1.xsd
View File

@@ -10,7 +10,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:annotation>
<xsd:documentation>

2
spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-4.1.xsd
View File

@@ -11,7 +11,7 @@
<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"/>
schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.1.xsd"/>
<xsd:element name="xmpp-connection">
<xsd:annotation>