From 1a31356b1e1a9d24a7e16712f69e86842c54962d Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 24 Aug 2009 22:30:27 +0000 Subject: [PATCH] INT-771 removed explicit versions from XSD declarations in tests --- .../ChannelAdapterSecurityIntegrationTests-context.xml | 10 +++++----- .../config/DefaultConfigurationTests-context.xml | 4 ++-- .../config/SecuredChannelsParserTests-context.xml | 10 +++++----- .../security/config/commonSecurityConfiguration.xml | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml index 7bc7c5bdfd..7f4903b27d 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml @@ -6,15 +6,15 @@ xmlns:security="http://www.springframework.org/schema/security" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-2.0.xsd + http://www.springframework.org/schema/security/spring-security.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/security - http://www.springframework.org/schema/integration/security/spring-integration-security-1.0.xsd + http://www.springframework.org/schema/integration/security/spring-integration-security.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/DefaultConfigurationTests-context.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/DefaultConfigurationTests-context.xml index 955f077379..fc2d3b7efc 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/DefaultConfigurationTests-context.xml +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/DefaultConfigurationTests-context.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/integration/security" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration/security - http://www.springframework.org/schema/integration/security/spring-integration-security-1.0.xsd"> + http://www.springframework.org/schema/integration/security/spring-integration-security.xsd"> diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests-context.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests-context.xml index bb6984cd5d..c861948b3f 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests-context.xml +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests-context.xml @@ -6,15 +6,15 @@ xmlns:security="http://www.springframework.org/schema/security" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-2.0.xsd + http://www.springframework.org/schema/security/spring-security.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/security - http://www.springframework.org/schema/integration/security/spring-integration-security-1.0.xsd + http://www.springframework.org/schema/integration/security/spring-integration-security.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml index 1202877a2e..8dd319994e 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml @@ -5,11 +5,11 @@ xmlns:security="http://www.springframework.org/schema/security" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-2.0.xsd + http://www.springframework.org/schema/security/spring-security.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context.xsd">