Update support for using "." as path separator

Issue: SPR-11660

spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java

@@ -330,11 +330,11 @@ class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser {
 		if (simpleBrokerElem != null) {
 			String prefix = simpleBrokerElem.getAttribute("prefix");
 			cavs.addIndexedArgumentValue(3, Arrays.asList(StringUtils.tokenizeToStringArray(prefix, ",")));
-			String defaultSeparator = messageBrokerElement.getAttribute("default-separator");
-			if (!defaultSeparator.isEmpty()) {
-				cavs.addIndexedArgumentValue(4, new AntPathMatcher(defaultSeparator));
-			}
 			brokerDef = new RootBeanDefinition(SimpleBrokerMessageHandler.class, cavs, null);
+			if (messageBrokerElement.hasAttribute("path-matcher")) {
+				brokerDef.getPropertyValues().add("pathMatcher",
+						new RuntimeBeanReference(messageBrokerElement.getAttribute("path-matcher")));
+			}
 		}
 		else if (brokerRelayElem != null) {
 			String prefix = brokerRelayElem.getAttribute("prefix");
@@ -454,15 +454,13 @@ class MessageBrokerBeanDefinitionParser implements BeanDefinitionParser {
 		mpvs.add("destinationPrefixes",Arrays.asList(StringUtils.tokenizeToStringArray(appDestPrefix, ",")));
 		mpvs.add("messageConverter", brokerMessageConverterRef);
 
-		RootBeanDefinition annotationMethodMessageHandlerDef =
-				new RootBeanDefinition(SimpAnnotationMethodMessageHandler.class, cavs, mpvs);
-
-		String defaultSeparator = messageBrokerElement.getAttribute("default-separator");
-		if (!defaultSeparator.isEmpty()) {
-			annotationMethodMessageHandlerDef.getPropertyValues().add("pathMatcher", new AntPathMatcher(defaultSeparator));
+		RootBeanDefinition beanDef = new RootBeanDefinition(SimpAnnotationMethodMessageHandler.class, cavs, mpvs);
+		if (messageBrokerElement.hasAttribute("path-matcher")) {
+			beanDef.getPropertyValues().add("pathMatcher",
+					new RuntimeBeanReference(messageBrokerElement.getAttribute("path-matcher")));
 		}
 
-		registerBeanDef(annotationMethodMessageHandlerDef, parserCxt, source);
+		registerBeanDef(beanDef, parserCxt, source);
 	}
 
 	private RuntimeBeanReference registerUserDestinationResolver(Element messageBrokerElement,

spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.1.xsd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-  ~ Copyright 2002-2013 the original author or authors.
+  ~ Copyright 2002-2014 the original author or authors.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,12 +19,13 @@
 <xsd:schema xmlns="http://www.springframework.org/schema/websocket"
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:beans="http://www.springframework.org/schema/beans"
+			xmlns:tool="http://www.springframework.org/schema/tool"
             targetNamespace="http://www.springframework.org/schema/websocket"
             elementFormDefault="qualified"
             attributeFormDefault="unqualified">
 
-    <xsd:import namespace="http://www.springframework.org/schema/beans"
-                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"/>
+    <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool" schemaLocation="http://www.springframework.org/schema/tool/spring-tool-4.1.xsd" />
 
     <xsd:complexType name="mapping">
         <xsd:annotation>
@@ -687,14 +688,31 @@
                     ]]></xsd:documentation>
                 </xsd:annotation>
             </xsd:attribute>
-			<xsd:attribute name="default-separator" type="xsd:string">
+			<xsd:attribute name="path-matcher" type="xsd:string">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-	Customize the default separator used for destination patterns matching/combining.
-	It could be used to configure "." as the default separator, since it is used in most
-	STOMP broker relay, enabling destination patterns like "/topic/PRICE.STOCK.**".
-	The default separator is "/".
+	A reference to the PathMatcher to use to match the destinations of incoming
+	messages to @MessageMapping and @SubscribeMapping methods.
+
+	By default AntPathMatcher is configured.
+	However applications may provide an AntPathMatcher instance
+	customized to use "." (commonly used in messaging) instead of "/" as path
+	separator or provide a completely different PathMatcher implementation.
+
+	Note that the configured PathMatcher is only used for matching the
+	portion of the destination after the configured prefix. For example given
+	application destination prefix "/app" and destination "/app/price.stock.**",
+	the message might be mapped to a controller with "price" and "stock.**"
+	as its type and method-level mappings respectively.
+
+	When the simple broker is enabled, the PathMatcher configured here is
+	also used to match message destinations when brokering messages.
                     ]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:expected-type type="java:org.springframework.util.PathMatcher" />
+						</tool:annotation>
+					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
             <xsd:attribute name="order" type="xsd:token">

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters-defaults-off.xml

@@ -2,7 +2,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:message-broker>
 

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters.xml

@@ -2,7 +2,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:message-broker>
 

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels-default-executor.xml

@@ -3,7 +3,7 @@
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:message-broker>
         <websocket:stomp-endpoint path="/foo"/>

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels.xml

@@ -2,7 +2,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:message-broker application-destination-prefix="/app" user-destination-prefix="/personal">
         <websocket:stomp-endpoint path="/foo,/bar">

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-relay.xml

@@ -2,7 +2,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:message-broker order="2">
         <websocket:stomp-endpoint path="/foo">

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml

@@ -2,9 +2,11 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
-    <websocket:message-broker application-destination-prefix="/app" user-destination-prefix="/personal" default-separator=".">
+    <websocket:message-broker application-destination-prefix="/app"
+							  user-destination-prefix="/personal"
+							  path-matcher="pathMatcher">
 
         <!-- message-size=128*1024, send-buffer-size=1024*1024 -->
         <websocket:transport message-size="131072" send-timeout="25000" send-buffer-size="1048576" />
@@ -22,6 +24,10 @@
 
     </websocket:message-broker>
 
+	<bean id="pathMatcher" class="org.springframework.util.AntPathMatcher">
+		<property name="pathSeparator" value="." />
+	</bean>
+
     <bean id="myHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
 
 </beans>

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-attributes.xml

@@ -3,7 +3,7 @@
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:handlers order="2">
         <websocket:mapping path="/foo" handler="fooHandler"/>

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs-attributes.xml

@@ -3,7 +3,7 @@
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:handlers >
         <websocket:mapping path="/test" handler="testHandler"/>

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers-sockjs.xml

@@ -3,7 +3,7 @@
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:handlers>
         <websocket:mapping path="/test" handler="testHandler"/>

spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-handlers.xml

@@ -3,7 +3,7 @@
        xmlns:websocket="http://www.springframework.org/schema/websocket"
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.1.xsd">
+		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket.xsd">
 
     <websocket:handlers>
         <websocket:mapping path="/foo,/bar" handler="fooHandler"/>