diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd
deleted file mode 100644
index 1962fbb2a0..0000000000
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-1.0.xsd
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
deleted file mode 100644
index 24291ee736..0000000000
--- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Defines a mail-sending target.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Defines a polling mail source.
-
-
-
-
-
-
-
-
-
-
-
-
- Defines a polling mail source.
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/org.springframework.integration.adapter/src/main/resources/META-INF/spring.schemas b/org.springframework.integration.adapter/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 00c9dc8137..0000000000
--- a/org.springframework.integration.adapter/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1,2 +0,0 @@
-http\://www.springframework.org/schema/integration/spring-integration-adapters-1.0.xsd=org/springframework/integration/adapter/config/spring-integration-adapters-1.0.xsd
-http\://www.springframework.org/schema/integration/spring-integration-1.0.xsd=org/springframework/integration/adapter/config/spring-integration-1.0.xsd
\ No newline at end of file
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
similarity index 99%
rename from org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
rename to org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
index 0904c894c1..083cc43c03 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-core-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/spring-integration-1.0.xsd
@@ -1,5 +1,4 @@
-
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
index 2114fdf39b..8c1640fe78 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
index b7904bbdc1..0f9d1d023a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
index b3799ca512..c21b08d999 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
index 851c32d019..112d2dd73f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
index f984257e3c..815eaf2417 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
index 1006ae307b..19bbed5674 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
index d69fc46939..7a6c2c5520 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
index 34bc5e3546..06082d12df 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
index aeac23e091..54b151983f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointInterceptorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointInterceptorTests.xml
index c8d57a0a63..f377e03fd5 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointInterceptorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointInterceptorTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
index 8e107a7643..3cd67d2464 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithErrorHandler.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
index c483be32a4..db2baffa11 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
index a6594b3b7a..6d3a0a2a5b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index f9dc6cc0cb..c21a156ca4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
index c99e9d8388..a4879a54f8 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/wireTapParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
index 8f2fa7f1df..c2220be540 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
index a6d0e59bc5..b2c390387a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
index 41d34669c7..0964d803d0 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
index 10dbb34222..5af16141dd 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
index 06b6affe02..e4fb07d0b4 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
index c8c3f61ef9..34fa7adf91 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
index 16c88866b8..92f0a5cad8 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/gatewayParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/gatewayParserTests.xml
index f39e195986..6c1e393c2e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/gatewayParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/config/gatewayParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
index aafe90e84b..459ec7f8fa 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
index 9e2d8a6836..608343e01e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
index ba29f2be61..8d42c4566c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
index 5026227843..f2fc46f637 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
index cc195adfa5..308d6151b8 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-core-1.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">