From 072b73354f65268844894fd895edd1e96e88ead8 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sun, 3 Oct 2010 22:06:18 +0100 Subject: [PATCH] Update namespace handler message to account for later schema versions being used by mistake. --- .../security/config/SecurityNamespaceHandler.java | 5 +++-- .../security/config/SecurityNamespacehandlerTests.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java index 6b4ea6bb7d..bdc6141fa5 100644 --- a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java +++ b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java @@ -39,8 +39,9 @@ public final class SecurityNamespaceHandler implements NamespaceHandler { public BeanDefinition parse(Element element, ParserContext pc) { if (!namespaceMatchesVersion(element)) { - pc.getReaderContext().fatal("You cannot use a spring-security-2.0.xsd schema with Spring Security 3.0." + - " Please update your schema declarations to the 3.0 schema.", element); + pc.getReaderContext().fatal("You must use a 3.0 schema with Spring Security 3.0." + + "(2.0 or 3.1 versions are not valid)" + + " Please update your schema declarations to the 3.0.3 schema (spring-security-3.0.3.xsd).", element); } String name = pc.getDelegate().getLocalName(element); BeanDefinitionParser parser = parsers.get(name); diff --git a/config/src/test/java/org/springframework/security/config/SecurityNamespacehandlerTests.java b/config/src/test/java/org/springframework/security/config/SecurityNamespacehandlerTests.java index 12d19ca476..3b2323821a 100644 --- a/config/src/test/java/org/springframework/security/config/SecurityNamespacehandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/SecurityNamespacehandlerTests.java @@ -23,7 +23,7 @@ public class SecurityNamespacehandlerTests { ); fail("Expected BeanDefinitionParsingException"); } catch (BeanDefinitionParsingException expected) { - assertTrue(expected.getMessage().contains("You cannot use a spring-security-2.0.xsd schema")); + assertTrue(expected.getMessage().contains("You must use a 3.0 schema with Spring Security 3.0.")); } } }