Rearranged web.socket.server subpackages and introduced web.socket.config

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

@@ -1,19 +1,3 @@
-<!--
-  ~ Copyright 2002-2013 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.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:websocket="http://www.springframework.org/schema/websocket"
@@ -22,29 +6,29 @@
 
     <websocket:message-broker application-destination-prefix="/app" user-destination-prefix="/personal">
         <websocket:stomp-endpoint path="/foo,/bar">
-            <websocket:handshake-handler ref="myHandler" />
+            <websocket:handshake-handler ref="myHandler"/>
         </websocket:stomp-endpoint>
-        <websocket:simple-broker prefix="/topic" />
+        <websocket:simple-broker prefix="/topic"/>
         <websocket:client-inbound-channel>
-            <websocket:executor core-pool-size="100" max-pool-size="200" keep-alive-seconds="600" />
+            <websocket:executor core-pool-size="100" max-pool-size="200" keep-alive-seconds="600"/>
             <websocket:interceptors>
-                <ref bean="myInterceptor" />
+                <ref bean="myInterceptor"/>
             </websocket:interceptors>
         </websocket:client-inbound-channel>
         <websocket:client-outbound-channel>
-            <websocket:executor core-pool-size="101" max-pool-size="201" keep-alive-seconds="601" />
+            <websocket:executor core-pool-size="101" max-pool-size="201" keep-alive-seconds="601"/>
             <websocket:interceptors>
-                <ref bean="myInterceptor" />
-                <bean class="org.springframework.messaging.support.channel.ChannelInterceptorAdapter" />
+                <ref bean="myInterceptor"/>
+                <bean class="org.springframework.messaging.support.channel.ChannelInterceptorAdapter"/>
             </websocket:interceptors>
         </websocket:client-outbound-channel>
         <websocket:broker-channel>
-            <websocket:executor core-pool-size="102" max-pool-size="202" keep-alive-seconds="602" />
+            <websocket:executor core-pool-size="102" max-pool-size="202" keep-alive-seconds="602"/>
         </websocket:broker-channel>
     </websocket:message-broker>
 
-    <bean id="myHandler" class="org.springframework.web.socket.server.config.xml.TestHandshakeHandler" />
+    <bean id="myHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
 
-    <bean id="myInterceptor" class="org.springframework.messaging.support.channel.ChannelInterceptorAdapter" />
+    <bean id="myInterceptor" class="org.springframework.messaging.support.channel.ChannelInterceptorAdapter"/>
 
 </beans>

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

@@ -1,19 +1,3 @@
-<!--
-  ~ Copyright 2002-2013 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.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:websocket="http://www.springframework.org/schema/websocket"
@@ -22,8 +6,8 @@
 
     <websocket:message-broker order="2">
         <websocket:stomp-endpoint path="/foo">
-            <websocket:handshake-handler ref="myHandler" />
-            <websocket:sockjs />
+            <websocket:handshake-handler ref="myHandler"/>
+            <websocket:sockjs/>
         </websocket:stomp-endpoint>
         <websocket:stomp-broker-relay
                 prefix="/topic,/queue"
@@ -36,5 +20,6 @@
                 virtual-host="spring.io"/>
     </websocket:message-broker>
 
-    <bean id="myHandler" class="org.springframework.web.socket.server.config.xml.TestWebSocketHandler" />
+    <bean id="myHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+
 </beans>

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

@@ -0,0 +1,20 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       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.0.xsd">
+
+    <websocket:message-broker application-destination-prefix="/app" user-destination-prefix="/personal">
+        <websocket:stomp-endpoint path=" /foo,/bar">
+            <websocket:handshake-handler ref="myHandler"/>
+        </websocket:stomp-endpoint>
+        <websocket:stomp-endpoint path="/test,/sockjs">
+            <websocket:handshake-handler ref="myHandler"/>
+            <websocket:sockjs/>
+        </websocket:stomp-endpoint>
+        <websocket:simple-broker prefix="/topic"/>
+    </websocket:message-broker>
+
+    <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

@@ -0,0 +1,24 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       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.0.xsd">
+
+    <websocket:handlers order="2">
+        <websocket:mapping path="/foo" handler="fooHandler"/>
+        <websocket:mapping path="/test" handler="testHandler"/>
+        <websocket:handshake-handler ref="testHandshakeHandler"/>
+        <websocket:handshake-interceptors>
+            <bean class="org.springframework.web.socket.config.FooTestInterceptor"/>
+            <ref bean="barTestInterceptor"/>
+        </websocket:handshake-interceptors>
+    </websocket:handlers>
+
+    <bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+    <bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
+
+    <bean id="barTestInterceptor" class="org.springframework.web.socket.config.BarTestInterceptor"/>
+    <bean id="testHandshakeHandler" class="org.springframework.web.socket.config.TestHandshakeHandler"/>
+
+</beans>

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

@@ -1,19 +1,3 @@
-<!--
-  ~ Copyright 2002-2013 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.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:websocket="http://www.springframework.org/schema/websocket"
@@ -22,7 +6,7 @@
 		http://www.springframework.org/schema/websocket http://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd">
 
     <websocket:handlers >
-        <websocket:mapping path="/test" handler="testHandler" />
+        <websocket:mapping path="/test" handler="testHandler"/>
         <websocket:sockjs task-scheduler="testTaskScheduler"
                           name="testSockJsService"
                           websocket-enabled="false"
@@ -33,18 +17,18 @@
                           heartbeat-time="20">
             <websocket:transport-handlers register-defaults="false">
                 <bean class="org.springframework.web.socket.sockjs.transport.handler.XhrPollingTransportHandler"/>
-                <ref bean="xhrStreamingTransportHandler" />
+                <ref bean="xhrStreamingTransportHandler"/>
             </websocket:transport-handlers>
         </websocket:sockjs>
     </websocket:handlers>
 
     <bean id="testHandler"
-          class="org.springframework.web.socket.server.config.xml.TestWebSocketHandler" />
+          class="org.springframework.web.socket.config.TestWebSocketHandler"/>
 
     <bean id="xhrStreamingTransportHandler"
-          class="org.springframework.web.socket.sockjs.transport.handler.XhrStreamingTransportHandler" />
+          class="org.springframework.web.socket.sockjs.transport.handler.XhrStreamingTransportHandler"/>
 
     <bean id="testTaskScheduler"
-          class="org.springframework.web.socket.server.config.xml.TestTaskScheduler" />
+          class="org.springframework.web.socket.config.TestTaskScheduler"/>
 
 </beans>

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

@@ -0,0 +1,17 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       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.0.xsd">
+
+    <websocket:handlers>
+        <websocket:mapping path="/test" handler="testHandler"/>
+        <websocket:mapping path="/foo/" handler="fooHandler"/>
+        <websocket:sockjs/>
+    </websocket:handlers>
+
+    <bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+    <bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
+
+</beans>

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

@@ -0,0 +1,19 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       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.0.xsd">
+
+    <websocket:handlers>
+        <websocket:mapping path="/foo,/bar" handler="fooHandler"/>
+    </websocket:handlers>
+
+    <websocket:handlers>
+        <websocket:mapping path="/test" handler="testHandler"/>
+    </websocket:handlers>
+
+    <bean id="testHandler" class="org.springframework.web.socket.config.TestWebSocketHandler"/>
+    <bean id="fooHandler" class="org.springframework.web.socket.config.FooWebSocketHandler"/>
+
+</beans>

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

@@ -1,35 +0,0 @@
-<!--
-  ~ Copyright 2002-2013 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.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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.0.xsd">
-
-    <websocket:message-broker application-destination-prefix="/app" user-destination-prefix="/personal">
-        <websocket:stomp-endpoint path=" /foo,/bar">
-            <websocket:handshake-handler ref="myHandler" />
-        </websocket:stomp-endpoint>
-        <websocket:stomp-endpoint path="/test,/sockjs">
-            <websocket:handshake-handler ref="myHandler" />
-            <websocket:sockjs />
-        </websocket:stomp-endpoint>
-        <websocket:simple-broker prefix="/topic" />
-    </websocket:message-broker>
-
-    <bean id="myHandler" class="org.springframework.web.socket.server.config.xml.TestHandshakeHandler" />
-</beans>

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

@@ -1,40 +0,0 @@
-<!--
-  ~ Copyright 2002-2013 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.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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.0.xsd">
-
-    <websocket:handlers order="2">
-        <websocket:mapping path="/foo" handler="fooHandler" />
-        <websocket:mapping path="/test" handler="testHandler" />
-        <websocket:handshake-handler ref="testHandshakeHandler" />
-        <websocket:handshake-interceptors>
-            <bean class="org.springframework.web.socket.server.config.xml.FooTestInterceptor"/>
-            <ref bean="barTestInterceptor" />
-        </websocket:handshake-interceptors>
-    </websocket:handlers>
-
-    <bean id="testHandler" class="org.springframework.web.socket.server.config.xml.TestWebSocketHandler" />
-    <bean id="fooHandler" class="org.springframework.web.socket.server.config.xml.FooWebSocketHandler" />
-
-    <bean id="barTestInterceptor" class="org.springframework.web.socket.server.config.xml.BarTestInterceptor"/>
-    <bean id="testHandshakeHandler" class="org.springframework.web.socket.server.config.xml.TestHandshakeHandler" />
-
-</beans>

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

@@ -1,33 +0,0 @@
-<!--
-  ~ Copyright 2002-2013 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.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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.0.xsd">
-
-    <websocket:handlers>
-        <websocket:mapping path="/test" handler="testHandler" />
-        <websocket:mapping path="/foo/" handler="fooHandler" />
-        <websocket:sockjs/>
-    </websocket:handlers>
-
-    <bean id="testHandler" class="org.springframework.web.socket.server.config.xml.TestWebSocketHandler" />
-    <bean id="fooHandler" class="org.springframework.web.socket.server.config.xml.FooWebSocketHandler" />
-
-</beans>

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

@@ -1,35 +0,0 @@
-<!--
-  ~ Copyright 2002-2013 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.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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.0.xsd">
-
-    <websocket:handlers>
-        <websocket:mapping path="/foo,/bar" handler="fooHandler" />
-    </websocket:handlers>
-
-    <websocket:handlers>
-        <websocket:mapping path="/test" handler="testHandler" />
-    </websocket:handlers>
-
-    <bean id="testHandler" class="org.springframework.web.socket.server.config.xml.TestWebSocketHandler" />
-    <bean id="fooHandler" class="org.springframework.web.socket.server.config.xml.FooWebSocketHandler" />
-
-</beans>