Permalink
Browse files

INT-2536 Create 2.2 Schemas

Add 2.2 versions of module schemas.

JMX is already covered by an existing pull request.

INT-2536 Schema Check

Bump version for schema check in
AbstractIntegrationNamespaceHandler.

INT-2536 Remove Schema Versions

Some test config files had 2.1 versioned schemas.
  • Loading branch information...
1 parent fae49aa commit 95cd202be611f2dbac1e8ffa2b463a069a4c355b @garyrussell garyrussell committed with Oleg Zhurakousky Apr 27, 2012
Showing with 12,952 additions and 54 deletions.
  1. +2 −1 spring-integration-amqp/src/main/resources/META-INF/spring.schemas
  2. +745 −0 ...qp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd
  3. +1 −1 ...egration-amqp/src/test/java/org/springframework/integration/amqp/config/ChannelSample-context.xml
  4. +1 −1 ...on-amqp/src/test/java/org/springframework/integration/amqp/config/PubSubChannelSample-context.xml
  5. +1 −1 ...src/main/java/org/springframework/integration/config/xml/AbstractIntegrationNamespaceHandler.java
  6. +2 −1 spring-integration-core/src/main/resources/META-INF/spring.schemas
  7. +3,635 −0 ...ion-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.2.xsd
  8. +1 −1 .../org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml
  9. +1 −1 ...src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests-context.xml
  10. +1 −1 .../java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-after-context.xml
  11. +1 −1 ...java/org/springframework/integration/config/xml/TestDisableChannelAutoCreation-before-context.xml
  12. +1 −1 ...t/java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-after-context.xml
  13. +1 −1 .../java/org/springframework/integration/config/xml/TestEnableChannelAutoCreation-before-context.xml
  14. +1 −1 .../src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-custom.xml
  15. +1 −1 ...re/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-fail.xml
  16. +1 −1 ...t/java/org/springframework/integration/resource/ResourcePatternResolver-config-usage-emptyref.xml
  17. +1 −1 ...e/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-usage.xml
  18. +1 −1 ...src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config-usagerf.xml
  19. +1 −1 ...on-core/src/test/java/org/springframework/integration/resource/ResourcePatternResolver-config.xml
  20. +2 −1 spring-integration-event/src/main/resources/META-INF/spring.schemas
  21. +113 −0 .../src/main/resources/org/springframework/integration/event/config/spring-integration-event-2.2.xsd
  22. +2 −1 spring-integration-feed/src/main/resources/META-INF/spring.schemas
  23. +87 −0 ...ed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-2.2.xsd
  24. +2 −1 spring-integration-file/src/main/resources/META-INF/spring.schemas
  25. +435 −0 ...le/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.2.xsd
  26. +2 −1 spring-integration-ftp/src/main/resources/META-INF/spring.schemas
  27. +483 −0 ...-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-2.2.xsd
  28. +2 −1 spring-integration-gemfire/src/main/resources/META-INF/spring.schemas
  29. +222 −0 ...n/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-2.2.xsd
  30. +1 −1 ...tion-gemfire/src/test/java/org/springframework/integration/gemfire/store/gemfire-queue-config.xml
  31. +2 −1 spring-integration-groovy/src/main/resources/META-INF/spring.schemas
  32. +72 −0 ...rc/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-2.2.xsd
  33. +2 −1 spring-integration-http/src/main/resources/META-INF/spring.schemas
  34. +690 −0 ...tp/src/main/resources/org/springframework/integration/http/config/spring-integration-http-2.2.xsd
  35. +1 −1 ...egration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests-context.xml
  36. +2 −1 spring-integration-ip/src/main/resources/META-INF/spring.schemas
  37. +584 −0 ...ion-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-2.2.xsd
  38. +1 −1 ...ion-ip/src/test/java/org/springframework/integration/ip/tcp/ClientModeControlBusTests-context.xml
  39. +2 −1 spring-integration-jdbc/src/main/resources/META-INF/spring.schemas
  40. +1,316 −0 ...bc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd
  41. +1 −1 ...ringframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests-context.xml
  42. +1 −1 ...framework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests-context.xml
  43. +1 −1 ...ork/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests-context.xml
  44. +1 −1 ...st/java/org/springframework/integration/jdbc/config/storedProcPollingChannelAdapterParserTest.xml
  45. +2 −1 spring-integration-jms/src/main/resources/META-INF/spring.schemas
  46. +1,266 −0 ...-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-2.2.xsd
  47. +2 −2 ...integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests-context.xml
  48. +2 −2 .../test/java/org/springframework/integration_/mbeanexporterhelper/single-config-custom-exporter.xml
  49. +2 −2 ...egration-jmx/src/test/java/org/springframework/integration_/mbeanexporterhelper/single-config.xml
  50. +2 −1 spring-integration-mail/src/main/resources/META-INF/spring.schemas
  51. +325 −0 ...il/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-2.2.xsd
  52. +2 −1 spring-integration-redis/src/main/resources/META-INF/spring.schemas
  53. +283 −0 .../src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-2.2.xsd
  54. +2 −1 spring-integration-rmi/src/main/resources/META-INF/spring.schemas
  55. +107 −0 ...-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.2.xsd
  56. +4 −2 spring-integration-scripting/src/main/resources/META-INF/spring.schemas
  57. +41 −0 ...n/resources/org/springframework/integration/scripting/config/spring-integration-scripting-2.2.xsd
  58. +83 −0 ...ources/org/springframework/integration/scripting/config/spring-integration-scripting-core-2.2.xsd
  59. +2 −1 spring-integration-security/src/main/resources/META-INF/spring.schemas
  60. +54 −0 ...ain/resources/org/springframework/integration/security/config/spring-integration-security-2.2.xsd
  61. +2 −1 spring-integration-sftp/src/main/resources/META-INF/spring.schemas
  62. +491 −0 ...tp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-2.2.xsd
  63. +2 −1 spring-integration-stream/src/main/resources/META-INF/spring.schemas
  64. +81 −0 ...rc/main/resources/org/springframework/integration/stream/config/spring-integration-stream-2.2.xsd
  65. +2 −1 spring-integration-twitter/src/main/resources/META-INF/spring.schemas
  66. +196 −0 .../main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-2.2.xsd
  67. +2 −1 spring-integration-ws/src/main/resources/META-INF/spring.schemas
  68. +435 −0 ...ion-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.2.xsd
  69. +1 −1 ...rc/test/java/org/springframework/integration/ws/config/ws-outbound-gateway-with-headermappers.xml
  70. +2 −1 spring-integration-xml/src/main/resources/META-INF/spring.schemas
  71. +752 −0 ...-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-2.2.xsd
  72. +2 −1 spring-integration-xmpp/src/main/resources/META-INF/spring.schemas
  73. +378 −0 ...pp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.2.xsd
  74. +1 −1 src/reference/docbook/whats-new.xml
@@ -1,2 +1,3 @@
http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.1.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd
-http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.1.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd
+http\://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd=org/springframework/integration/amqp/config/spring-integration-amqp-2.2.xsd

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -6,7 +6,7 @@
xmlns:console="http://www.springframework.org/schema/integration/stream"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
@@ -6,7 +6,7 @@
xmlns:console="http://www.springframework.org/schema/integration/stream"
xmlns:rabbit="http://www.springframework.org/schema/rabbit"
xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd
http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
@@ -42,7 +42,7 @@
*/
public abstract class AbstractIntegrationNamespaceHandler implements NamespaceHandler {
- private static final String VERSION = "2.1";
+ private static final String VERSION = "2.2";
public static final String CHANNEL_INITIALIZER_BEAN_NAME = "channelInitializer";
@@ -1,4 +1,5 @@
http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/config/xml/spring-integration-1.0.xsd
http\://www.springframework.org/schema/integration/spring-integration-2.0.xsd=org/springframework/integration/config/xml/spring-integration-2.0.xsd
http\://www.springframework.org/schema/integration/spring-integration-2.1.xsd=org/springframework/integration/config/xml/spring-integration-2.1.xsd
-http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.1.xsd
+http\://www.springframework.org/schema/integration/spring-integration-2.2.xsd=org/springframework/integration/config/xml/spring-integration-2.2.xsd
+http\://www.springframework.org/schema/integration/spring-integration.xsd=org/springframework/integration/config/xml/spring-integration-2.2.xsd
Oops, something went wrong.

0 comments on commit 95cd202

Please sign in to comment.